X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fimport_archive.py;h=7f62fa3cff619d72c20cf25bb7397423500c32c2;hb=2764c503d2f9c2177873f861c9dad76bcd2c04ca;hp=f064b4aef75160b09f2f330425460ae0b278056b;hpb=5bc1925a3750cbafc82703c60c5106686c8c7af4;p=dak.git

diff --git a/dak/import_archive.py b/dak/import_archive.py
index f064b4ae..7f62fa3c 100755
--- a/dak/import_archive.py
+++ b/dak/import_archive.py
@@ -98,8 +98,8 @@ def check_signature (filename):
         return None
 
     status_read, status_write = os.pipe()
-    cmd = "gpgv --status-fd %s --keyring %s --keyring %s %s" \
-          % (status_write, Cnf["Dinstall::PGPKeyring"], Cnf["Dinstall::GPGKeyring"], filename)
+    cmd = "gpgv --status-fd %s %s %s" \
+          % (status_write, daklib.utils.gpg_keyring_args(), filename)
     (output, status, exit_status) = daklib.utils.gpgv_get_status_output(cmd, status_read, status_write)
 
     # Process the status-fd output
@@ -280,7 +280,6 @@ def update_section():
                 prefix = ""
         else:
             prefix = ""
-            component = component.replace("non-US/", "")
             if component != 'main':
                 suffix = '/' + component
             else: