From: Anthony Towns Date: Mon, 18 Jun 2007 17:45:49 +0000 (+0100) Subject: utils.gpg_keyring_args is only available under daklib.utils... X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d6a3cba61d435c2aff711106d6cb3e111c0cb556;p=dak utils.gpg_keyring_args is only available under daklib.utils... --- diff --git a/dak/import_ldap_fingerprints.py b/dak/import_ldap_fingerprints.py index 5075f357..22ee2ddc 100755 --- a/dak/import_ldap_fingerprints.py +++ b/dak/import_ldap_fingerprints.py @@ -158,7 +158,7 @@ SELECT f.fingerprint, f.id, u.uid FROM fingerprint f, uid u WHERE f.uid = u.id for i in q.getresult(): (fingerprint, fingerprint_id) = i cmd = "gpg --no-default-keyring %s --fingerprint %s" \ - % (gpg_keyring_args(), fingerprint) + % (daklib.utils.gpg_keyring_args(), fingerprint) (result, output) = commands.getstatusoutput(cmd) if result == 0: m = re_gpg_fingerprint.search(output) @@ -177,7 +177,7 @@ SELECT f.fingerprint, f.id, u.uid FROM fingerprint f, uid u WHERE f.uid = u.id for keyring in Cnf.ValueList("Import-LDAP-Fingerprints::ExtraKeyrings"): extra_keyrings += " --keyring=%s" % (keyring) cmd = "gpg %s %s --list-key %s" \ - % (gpg_keyring_args(), extra_keyrings, fingerprint) + % (daklib.utils.gpg_keyring_args(), extra_keyrings, fingerprint) (result, output) = commands.getstatusoutput(cmd) if result != 0: cmd = "gpg --keyserver=%s --allow-non-selfsigned-uid --recv-key %s" % (Cnf["Import-LDAP-Fingerprints::KeyServer"], fingerprint)