X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=shania;h=6131cbc69225cdb6258d04df44e2588351b182cd;hb=30b41506a6105ab23a0cac9e8197475a89236224;hp=cab1c1f79c9d41b67c76c1fb1c5d261b962cde3a;hpb=2f5e692bfbbb6f8146f50d944f7fcc169a95a0a3;p=dak.git

diff --git a/shania b/shania
index cab1c1f7..6131cbc6 100755
--- a/shania
+++ b/shania
@@ -1,8 +1,8 @@
 #!/usr/bin/env python
 
 # Clean incoming of old unused files
-# Copyright (C) 2000, 2001  James Troup <james@nocrew.org>
-# $Id: shania,v 1.9 2001-11-18 19:57:58 rmurray Exp $
+# Copyright (C) 2000, 2001, 2002  James Troup <james@nocrew.org>
+# $Id: shania,v 1.14 2002-05-08 11:13:02 troup 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
@@ -20,8 +20,8 @@
 
 ################################################################################
 
-import os, re, stat, string, sys, time, traceback
-import utils
+import os, stat, sys, time;
+import utils;
 import apt_pkg;
 
 ################################################################################
@@ -46,6 +46,7 @@ import apt_pkg;
 Cnf = None;
 Options = None;
 del_dir = None;
+delete_date = None;
 
 ################################################################################
 
@@ -80,7 +81,7 @@ def init ():
     # Move to the directory to clean
     incoming = Options["Incoming"];
     if incoming == "":
-        incoming = Cnf["Dir::IncomingDir"];
+        incoming = Cnf["Dir::Queue::Unchecked"];
     os.chdir(incoming);
 
 # Remove a file to the morgue
@@ -90,7 +91,7 @@ def remove (file):
         # If the destination file exists; try to find another filename to use
         if os.path.exists(dest_filename):
             dest_filename = utils.find_next_free(dest_filename, 10);
-        utils.move(file, dest_filename);
+        utils.move(file, dest_filename, 0660);
     else:
         utils.warn("skipping '%s', permission denied." % (os.path.basename(file)));
 
@@ -181,10 +182,8 @@ def main ():
     if not Cnf.has_key("Shania::Options::Days"):
 	Cnf["Shania::Options::Days"] = "14";
 
-    apt_pkg.ReadConfigFileISC(Cnf,utils.which_conf_file());
-
     Arguments = [('h',"help","Shania::Options::Help"),
-                 ('d',"days","Shania::Options::Days", "IntVal"),
+                 ('d',"days","Shania::Options::Days", "IntLevel"),
                  ('i',"incoming","Shania::Options::Incoming", "HasArg"),
                  ('n',"no-action","Shania::Options::No-Action"),
                  ('v',"verbose","Shania::Options::Verbose")];