Merge pull request jordansissel#198 from mv/master

Warning: already initialized constant
doubleotoo · Apr 25, 2012 · d69dd68 · d69dd68
2 parents 8f4efb6 + 7333fcb
commit d69dd68
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/lib/fpm/package/deb.rb b/lib/fpm/package/deb.rb
@@ -17,7 +17,7 @@ class FPM::Package::Deb < FPM::Package
     :after_install      => "postinst",
     :before_remove      => "prerm",
     :after_remove       => "postrm",
-  }
+  } unless defined?(SCRIPT_MAP)
 
   option "--ignore-iteration-in-dependencies", :flag, 
             "For '=' (equal) dependencies, allow iterations on the specified " \

diff --git a/lib/fpm/package/rpm.rb b/lib/fpm/package/rpm.rb
@@ -21,13 +21,13 @@ class FPM::Package::RPM < FPM::Package
     "sha256" => 8,
     "sha384" => 9,
     "sha512" => 10
-  }
+  } unless defined?(DIGEST_ALGORITHM_MAP)
 
   COMPRESSION_MAP = {
     "xz" => "w2.xzdio",
     "gzip" => "w9.gzdio",
     "bzip2" => "w9.bzdio"
-  }
+  } unless defined?(COMPRESSION_MAP)
 
 
   option "--rpmbuild-define", "DEFINITION",