X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=shania;h=35577ec04821d407e1adb8e04b6675bf45646038;hb=f1da46727831e1d6bfbb611459fa398dcfcd0e91;hp=5cd8ad7aeeade885a753fad3ecf7e1f1c8b61d7d;hpb=bce58243846a5683b77f586c7210723b47227a60;p=dak.git

diff --git a/shania b/shania
index 5cd8ad7a..35577ec0 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.12 2002-02-12 22:14:38 troup Exp $
+# Copyright (C) 2000, 2001, 2002  James Troup <james@nocrew.org>
+# $Id: shania,v 1.15 2002-05-18 23:54:51 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
@@ -81,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
@@ -91,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)));
 
@@ -129,8 +129,8 @@ def flush_orphans ():
     # Proces all .changes and .dsc files.
     for changes_filename in changes_files:
         try:
-            changes = utils.parse_changes(changes_filename, 0)
-            files = utils.build_file_list(changes, "");
+            changes = utils.parse_changes(changes_filename);
+            files = utils.build_file_list(changes);
         except:
             utils.warn("error processing '%s'; skipping it. [Got %s]" % (changes_filename, sys.exc_type));
             continue;
@@ -139,8 +139,8 @@ def flush_orphans ():
         for file in files.keys():
             if file[-4:] == ".dsc":
                 try:
-                    dsc = utils.parse_changes(file, 0)
-                    dsc_files = utils.build_file_list(dsc, 1)
+                    dsc = utils.parse_changes(file);
+                    dsc_files = utils.build_file_list(dsc, is_a_dsc=1);
                 except:
                     utils.warn("error processing '%s'; skipping it. [Got %s]" % (file, sys.exc_type));
                     continue;