X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=shania;h=069df37d076829f35985650efe1d2e97d91b00f8;hb=791e932971b92146d3621efdd29facc02b109774;hp=963748ea338faa6d2da4aa9bf1dbf5680b91d3ab;hpb=f1156c68d286a154ddd6baddfaff8b709acd4d91;p=dak.git

diff --git a/shania b/shania
index 963748ea..069df37d 100755
--- a/shania
+++ b/shania
@@ -2,7 +2,7 @@
 
 # Clean incoming of old unused files
 # Copyright (C) 2000, 2001  James Troup <james@nocrew.org>
-# $Id: shania,v 1.5 2001-06-23 00:25:52 troup Exp $
+# $Id: shania,v 1.10 2001-11-19 20:42:40 rmurray Exp $
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -25,7 +25,7 @@ import utils
 import apt_pkg;
 
 ################################################################################
- 
+
 # 23:12|<aj> I will not hush!
 # 23:12|<elmo> :>
 # 23:12|<aj> Where there is injustice in the world, I shall be there!
@@ -49,9 +49,23 @@ del_dir = None;
 
 ################################################################################
 
+def usage (exit_code=0):
+    print """Usage: shania [OPTIONS]
+Clean out incoming directories.
+
+  -d, --days=DAYS            remove anything older than DAYS old
+  -i, --incoming=INCOMING    the incoming directory to clean
+  -n, --no-action            don't do anything
+  -v, --verbose              explain what is being done
+  -h, --help                 show this help and exit"""
+
+    sys.exit(exit_code)
+
+################################################################################
+
 def init ():
     global delete_date, del_dir;
-    
+
     delete_date = int(time.time())-(int(Options["Days"])*84600);
 
     # Ensure a directory exists to remove files to
@@ -79,7 +93,7 @@ def remove (file):
         utils.move(file, dest_filename);
     else:
         utils.warn("skipping '%s', permission denied." % (os.path.basename(file)));
-        
+
 # Removes any old files.
 # [Used for Incoming/REJECT]
 #
@@ -103,7 +117,7 @@ def flush_old ():
 def flush_orphans ():
     all_files = {};
     changes_files = [];
-    
+
     # Build up the list of all files in the directory
     for i in os.listdir('.'):
         if os.path.isfile(i):
@@ -117,7 +131,7 @@ def flush_orphans ():
             changes = utils.parse_changes(changes_filename, 0)
             files = utils.build_file_list(changes, "");
         except:
-            utils.warn("error processing '%s'; skipping it. [Got %s]" % (file, sys.exc_type));
+            utils.warn("error processing '%s'; skipping it. [Got %s]" % (changes_filename, sys.exc_type));
             continue;
 
         dsc_files = {};
@@ -139,7 +153,7 @@ def flush_orphans ():
                 if Options["Verbose"]:
                     print "Skipping, has parents, '%s'." % (key);
                 del all_files[key];
-                    
+
     # Anthing left at this stage is not referenced by a .changes (or
     # a .dsc) and should be deleted if old enough.
     for file in all_files.keys():
@@ -153,18 +167,21 @@ def flush_orphans ():
         else:
             if Options["Verbose"]:
                 print "Skipping, too new, '%s'." % (os.path.basename(file));
-    
+
+################################################################################
+
 def main ():
     global Cnf, Options;
-    
-    apt_pkg.init();
-    
-    Cnf = apt_pkg.newConfiguration();
-    apt_pkg.ReadConfigFileISC(Cnf,utils.which_conf_file());
-
-    Arguments = [('D',"debug","Shania::Options::Debug", "IntVal"),
-                 ('h',"help","Shania::Options::Help"),
-                 ('V',"version","Shania::Options::Version"),
+
+    Cnf = utils.get_conf()
+
+    for i in ["Help", "Incoming", "No-Action", "Verbose" ]:
+	if not Cnf.has_key("Shania::Options::%s" % (i)):
+	    Cnf["Shania::Options::%s" % (i)] = "";
+    if not Cnf.has_key("Shania::Options::Days"):
+	Cnf["Shania::Options::Days"] = "14";
+
+    Arguments = [('h',"help","Shania::Options::Help"),
                  ('d',"days","Shania::Options::Days", "IntVal"),
                  ('i',"incoming","Shania::Options::Incoming", "HasArg"),
                  ('n',"no-action","Shania::Options::No-Action"),
@@ -173,6 +190,9 @@ def main ():
     apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv);
     Options = Cnf.SubTree("Shania::Options")
 
+    if Options["Help"]:
+	usage();
+
     init ();
 
     if Options["Verbose"]: