X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fimport_keyring.py;h=89c2b755dc5942f56e8b28d42afa530a0ab73ea9;hb=7a23455cf4a831e599172f48ce29178e64dc09db;hp=849e064f8d5a88da55eb9ee402434eea110c7a79;hpb=5ece8ab10e15b67ef6b49269da1e79a886f4739d;p=dak.git

diff --git a/dak/import_keyring.py b/dak/import_keyring.py
index 849e064f..89c2b755 100755
--- a/dak/import_keyring.py
+++ b/dak/import_keyring.py
@@ -70,7 +70,8 @@ def usage (exit_code=0):
   -h, --help                  show this help and exit.
   -L, --import-ldap-users     generate uid entries for keyring from LDAP
   -U, --generate-users FMT    generate uid entries from keyring as FMT
-  -l, --list-uids STRING      list all uids matching *STRING*"""
+  -l, --list-uids STRING      list all uids matching *STRING*
+  -n, --no-action             don't change database"""
     sys.exit(exit_code)
 
 
@@ -84,17 +85,19 @@ def main():
                  ('L',"import-ldap-users","Import-Keyring::Options::Import-Ldap-Users"),
                  ('U',"generate-users","Import-Keyring::Options::Generate-Users", "HasArg"),
                  ('l',"list-uids","Import-Keyring::Options::List-UIDs", "HasArg"),
+                 ('n',"no-action","Import-Keyring::Options::No-Action"),
                 ]
 
-    for i in [ "help", "report-changes", "generate-users", "import-ldap-users", "list-uids"]:
+    for i in [ "help", "report-changes", "generate-users",
+	    "import-ldap-users", "list-uids", "no-action" ]:
         if not cnf.has_key("Import-Keyring::Options::%s" % (i)):
             cnf["Import-Keyring::Options::%s" % (i)] = ""
 
-    keyring_names = apt_pkg.ParseCommandLine(cnf.Cnf, Arguments, sys.argv)
+    keyring_names = apt_pkg.parse_commandline(cnf.Cnf, Arguments, sys.argv)
 
     ### Parse options
 
-    Options = cnf.SubTree("Import-Keyring::Options")
+    Options = cnf.subtree("Import-Keyring::Options")
 
     if Options["Help"]:
         usage()
@@ -271,7 +274,10 @@ def main():
                                                                                        keyring.keyring_name)
 
     # All done!
-    session.commit()
+    if Options["No-Action"]:
+	session.rollback()
+    else:
+	session.commit()
 
     # Print a summary
     changesd = {}