X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Futils.py;h=1fc1d4773110bc579f4c2b53e83e12f1b3c02f48;hb=682635f59f5271a071418e1eb6ccf0c3b3247c28;hp=6ec92f89ad7e03d60a2e793829333b3907128346;hpb=c16123ef7acfa534bb4b2b95a586f84de3dd95e8;p=dak.git

diff --git a/daklib/utils.py b/daklib/utils.py
old mode 100755
new mode 100644
index 6ec92f89..1fc1d477
--- a/daklib/utils.py
+++ b/daklib/utils.py
@@ -1362,7 +1362,7 @@ def check_signature (sig_filename, data_filename="", keyrings=None, autofetch=No
     # Finally ensure there's not something we don't recognise
     known_keywords = dict(VALIDSIG="",SIG_ID="",GOODSIG="",BADSIG="",ERRSIG="",
                           SIGEXPIRED="",KEYREVOKED="",NO_PUBKEY="",BADARMOR="",
-                          NODATA="",NOTATION_DATA="",NOTATION_NAME="",KEYEXPIRED="")
+                          NODATA="",NOTATION_DATA="",NOTATION_NAME="",KEYEXPIRED="",POLICY_URL="")
 
     for keyword in keywords.keys():
         if not known_keywords.has_key(keyword):
@@ -1504,7 +1504,8 @@ def get_changes_files(from_dir):
 apt_pkg.init()
 
 Cnf = apt_pkg.newConfiguration()
-apt_pkg.ReadConfigFileISC(Cnf,default_config)
+if not os.getenv("DAK_TEST"):
+    apt_pkg.ReadConfigFileISC(Cnf,default_config)
 
 if which_conf_file() != default_config:
     apt_pkg.ReadConfigFileISC(Cnf,which_conf_file())