From 6e5b0b3c9bc1a83e04e96d509c8b84d1be770737 Mon Sep 17 00:00:00 2001 From: Thomas Leonard Date: Thu, 23 Feb 2012 20:44:29 +0000 Subject: [PATCH] Removed deprecated --gpgsign option 0install no longer accepts these signatures. Suggested by Dave Abrahams. --- 0publish | 3 --- signing.py | 8 -------- 2 files changed, 11 deletions(-) diff --git a/0publish b/0publish index 6018279..3f5f674 100755 --- a/0publish +++ b/0publish @@ -19,7 +19,6 @@ parser.add_option("--archive-extract", help="subdirectory of archive to extract" parser.add_option("-c", "--create", help="create file if nonexistant", action='store_true') parser.add_option("-d", "--add-digest", help="add extra digests", action='store', metavar='ALG') parser.add_option("-e", "--edit", help="edit with $EDITOR", action='store_true') -parser.add_option("-g", "--gpgsign", help="add a GPG signature block", action='store_true') parser.add_option("-k", "--key", help="key to use for signing") parser.add_option("-l", "--local", help="deprecated; use --add-from instead", dest='add_from', metavar='LOCAL') parser.add_option("--manifest-algorithm", help="select algorithm for manifests", action='append', metavar='ALG') @@ -126,8 +125,6 @@ try: sign_fn = signing.sign_xml if options.unsign: sign_fn = signing.sign_unsigned - if options.gpgsign: - sign_fn = signing.sign_plain if options.key: print "Changing key from '%s' to '%s'" % (key, options.key) key = options.key diff --git a/signing.py b/signing.py index 3f5b628..26fb625 100644 --- a/signing.py +++ b/signing.py @@ -63,14 +63,6 @@ def run_gpg(default_key, *arguments): def sign_unsigned(path, data, key): os.rename(write_tmp(path, data), path) -def sign_plain(path, data, key): - tmp = write_tmp(path, data) - try: - run_gpg(key, '--clearsign', tmp) - finally: - os.unlink(tmp) - os.rename(tmp + '.asc', path) - def sign_xml(path, data, key): tmp = write_tmp(path, data) sigtmp = tmp + '.sig' -- 2.11.4.GIT