gistfile1.diff

commit 7e07c66ed7cbd983e0588d88cd95f8b3d7b43dc3
Author: Rail Aliiev <rail@mozilla.com>
Date:   Thu Jan 12 10:29:28 2012 -0500

    don't query env from classes

diff --git a/scripts/partner-repacks.py b/scripts/partner-repacks.py
index 148b083..d8d8fd2 100755
--- a/scripts/partner-repacks.py
+++ b/scripts/partner-repacks.py
@@ -314,7 +314,7 @@ def getFileExtension(version, platform):
 #########################################################################
 class RepackBase(object):
     def __init__(self, build, partner_dir, build_dir, working_dir, final_dir,
-                 platform_formatted, repack_info, file_mode=0644,
+                 platform_formatted, repack_info, signing_command, file_mode=0644,
                  signing_formats=None):
         self.base_dir = os.getcwd()
         self.build = build
@@ -325,6 +325,7 @@ class RepackBase(object):
         self.platform_formatted = platform_formatted
         self.repack_info = repack_info
         self.file_mode = file_mode
+        self.signing_command = signing_command
         self.signing_formats = signing_formats
         mkdir(self.working_dir)
 
@@ -367,7 +368,7 @@ class RepackBase(object):
 
     def signBuild(self):
         assert isinstance(self.signing_formats, (list, tuple))
-        signing_cmd = os.environ['MOZ_SIGN_CMD']
+        signing_cmd = self.signing_command
         for f in self.signing_formats:
             signing_cmd += ' --formats %s' % f
         signing_cmd += ' "%s"' % self.build
@@ -376,7 +377,7 @@ class RepackBase(object):
     def cleanup(self):
         move(self.build, self.final_dir)
         os.chmod(path.join(self.final_dir, path.basename(self.build)), self.file_mode)
-        if os.environ.get('MOZ_SIGN_CMD') and 'gpg' in self.signing_formats:
+        if self.signing_command and 'gpg' in self.signing_formats:
             move('%s.asc' % self.build, self.final_dir)
             os.chmod(path.join(self.final_dir, path.basename('%s.asc' % self.build)), self.file_mode)
 
@@ -386,7 +387,7 @@ class RepackBase(object):
         self.unpackBuild()
         self.copyFiles()
         self.repackBuild()
-        if os.environ.get('MOZ_SIGN_CMD'):
+        if self.signing_command:
             self.signBuild()
         self.announceSuccess()
         self.cleanup()
@@ -395,10 +396,11 @@ class RepackBase(object):
 #########################################################################
 class RepackLinux(RepackBase):
     def __init__(self, build, partner_dir, build_dir, working_dir, final_dir,
-                 platform_formatted, repack_info):
+                 platform_formatted, repack_info, signing_command):
         super(RepackLinux, self).__init__(build, partner_dir, build_dir, 
                                           working_dir, final_dir,
                                           platform_formatted, repack_info,
+                                          signing_command,
                                           signing_formats=['gpg'])
         self.uncompressed_build = build.replace('.bz2','')
 
@@ -426,10 +428,11 @@ class RepackLinux(RepackBase):
 #########################################################################
 class RepackMac(RepackBase):
     def __init__(self, build, partner_dir, build_dir, working_dir, final_dir,
-                 platform_formatted, repack_info):
+                 platform_formatted, repack_info, signing_command):
         super(RepackMac, self).__init__(build, partner_dir, build_dir,
                                         working_dir, final_dir,
                                         platform_formatted, repack_info,
+                                        signing_command,
                                         signing_formats=['gpg'])
         self.mountpoint = path.join("/tmp", "FirefoxInstaller")
 
@@ -468,10 +471,11 @@ class RepackMac(RepackBase):
 #########################################################################
 class RepackWin(RepackBase):
     def __init__(self, build, partner_dir, build_dir, working_dir, final_dir,
-                 platform_formatted, repack_info):
+                 platform_formatted, repack_info, signing_command):
         super(RepackWin, self).__init__(build, partner_dir, build_dir, 
                                         working_dir, final_dir,
                                         platform_formatted, repack_info,
+                                        signing_command,
                                         signing_formats=['gpg', 'signcode'])
 
     def copyFiles(self):
@@ -491,11 +495,12 @@ class RepackWin(RepackBase):
 #########################################################################
 class RepackMaemo(RepackBase):
     def __init__(self, build, partner_dir, build_dir, working_dir, final_dir,
-                 platform_formatted, repack_info, sbox_path=SBOX_PATH, 
+                 platform_formatted, repack_info, signing_command, sbox_path=SBOX_PATH,
                  sbox_home=SBOX_HOME):
         super(RepackMaemo, self).__init__(build, partner_dir, build_dir, 
                                           working_dir, final_dir,
-                                          platform_formatted, repack_info)
+                                          platform_formatted, repack_info,
+                                          signing_command)
 
         self.sbox_path = sbox_path
         self.sbox_home = sbox_home
@@ -647,6 +652,7 @@ if __name__ == '__main__':
                     'maemo4':        RepackMaemo,
                     'maemo5-gtk':    RepackMaemo
     }
+    signing_command = os.environ.get('MOZ_SIGN_CMD')
 
     parser = OptionParser(usage="usage: %prog [options]")
     parser.add_option("-d",
@@ -809,7 +815,7 @@ if __name__ == '__main__':
     # Local directories for builds
     original_builds_dir = path.join(os.getcwd(), "original_builds", options.version, "build%s" % str(options.build_number))
     repacked_builds_dir = path.join(os.getcwd(), "repacked_builds", options.version, "build%s" % str(options.build_number))
-    if not options.use_signed or not os.environ.get('MOZ_SIGN_CMD'):
+    if not options.use_signed or not signing_command:
         repacked_builds_dir = path.join(repacked_builds_dir, "unsigned")
     if not options.verify_only:
         mkdir(original_builds_dir)
@@ -946,7 +952,7 @@ if __name__ == '__main__':
             # did we need to do some scrubbing before we upload them for
             # re-signing.
             if 'win32' in repack_info['platforms'] and options.use_signed \
-               and not os.environ.get('MOZ_SIGN_CMD'):
+               and not signing_command:
                 repackSignedBuilds(repacked_builds_dir)
             # Remove our working dir so things are all cleaned up and ready for
             # easy upload.