jenkins-bot has submitted this change and it was merged.

Change subject: make-release: nicer exit when gpg fails/is absent
......................................................................


make-release: nicer exit when gpg fails/is absent

Change-Id: I49729c9c203168ad42cf2dca6c0f615ede0483f8
---
M make-release/make-release.py
1 file changed, 7 insertions(+), 2 deletions(-)

Approvals:
  Hashar: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/make-release/make-release.py b/make-release/make-release.py
index 25e9082..c576ba4 100755
--- a/make-release/make-release.py
+++ b/make-release/make-release.py
@@ -489,8 +489,13 @@
         uploadFiles = []
         for fileName in outFiles:
             if options.sign:
-                proc = subprocess.Popen([
-                    'gpg', '--detach-sign', dir + '/' + fileName])
+                try:
+                    proc = subprocess.Popen([
+                        'gpg', '--detach-sign', dir + '/' + fileName])
+                except OSError, e:
+                    print "gpg failed, does it exist? Skip with --dont-sign."
+                    print "Error %s: %s" % (e.errno, e.strerror)
+                    sys.exit(1)
                 if proc.wait() != 0:
                     print "gpg failed, exiting"
                     sys.exit(1)

-- 
To view, visit https://gerrit.wikimedia.org/r/89211
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I49729c9c203168ad42cf2dca6c0f615ede0483f8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/release
Gerrit-Branch: master
Gerrit-Owner: Hashar <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: jenkins-bot

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to