Bug 1202917 - Stop gpg signing partial mar, r=rail
authorNick Thomas <nthomas@mozilla.com>
Mon, 21 Sep 2015 15:18:22 +1200 (2015-09-21)
changeset 4462 277b9a39b70901ea2b599dedc8b11cc6a41d476b
parent 4461 40e466a477a570e0a4b5e4b493e5ac4d7a4ad162
child 4463 fa6f5140fd5a61c0a5beb2ab4d2837d9d3a8665d
push id3731
push usernthomas@mozilla.com
push dateMon, 21 Sep 2015 03:27:09 +0000 (2015-09-21)
reviewersrail
bugs1202917
Bug 1202917 - Stop gpg signing partial mar, r=rail
process/factory.py
--- a/process/factory.py
+++ b/process/factory.py
@@ -2542,18 +2542,17 @@ class ReleaseBuildFactory(MercurialBuild
                 workdir='%s/dist' % self.absMozillaObjDir,
                         haltOnFailure=True,
             ))
             self.UPLOAD_EXTRA_FILES.append(
                 '%s/%s' % (self.update_dir, partial_mar_name))
             if self.enableSigning and self.signingServers:
                 partial_mar_path = '%s/dist/%s/%s' % \
                     (self.absMozillaObjDir, self.update_dir, partial_mar_name)
-                cmd = '%s -f mar -f gpg "%s"' % (self.signing_command,
-                                                 partial_mar_path)
+                cmd = '%s -f mar "%s"' % (self.signing_command, partial_mar_path)
                 self.addStep(MockCommand(
                     name='sign_partial_mar',
                     description=['sign', 'partial', 'mar'],
                     command=['bash', '-c', WithProperties(cmd)],
                     env=updateEnv,
                     mock=self.use_mock,
                     target=self.mock_target,
                     workdir='.',