X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=shania;h=74a76055a02eab4c063a581be84e17df81c1cced;hb=9540d873fa78598454af57f5f8a4875969ed0439;hp=f01d20f1f84290dbb3c2fbbbb18e28c2a2dc13f3;hpb=6f6e200c45974e79d7b556b4b20dff6fa7fe9fa2;p=dak.git

diff --git a/shania b/shania
index f01d20f1..74a76055 100755
--- a/shania
+++ b/shania
@@ -2,7 +2,7 @@
 
 # Clean incoming of old unused files
 # Copyright (C) 2000, 2001, 2002  James Troup <james@nocrew.org>
-# $Id: shania,v 1.16 2002-05-23 09:54:23 troup Exp $
+# $Id: shania,v 1.18 2005-03-06 21:51:51 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
@@ -20,6 +20,20 @@
 
 ################################################################################
 
+# <aj> Bdale, a ham-er, and the leader,
+# <aj> Willy, a GCC maintainer,
+# <aj> Lamont-work, 'cause he's the top uploader....
+# <aj>         Penguin Puff' save the day!
+# <aj> Porting code, trying to build the world,
+# <aj> Here they come just in time...
+# <aj>         The Penguin Puff' Guys!
+# <aj> [repeat]
+# <aj> Penguin Puff'!
+# <aj> willy: btw, if you don't maintain gcc you need to start, since
+#      the lyrics fit really well that way
+
+################################################################################
+
 import os, stat, sys, time;
 import utils;
 import apt_pkg;
@@ -54,7 +68,7 @@ def init ():
 
     # Ensure a directory exists to remove files to
     if not Options["No-Action"]:
-        date = time.strftime("%Y-%m-%d", time.localtime(time.time()));
+        date = time.strftime("%Y-%m-%d");
         del_dir = Cnf["Dir::Morgue"] + '/' + Cnf["Shania::MorgueSubDir"] + '/' + date;
         if not os.path.exists(del_dir):
             os.makedirs(del_dir, 02775);
@@ -106,7 +120,7 @@ def flush_orphans ():
     for i in os.listdir('.'):
         if os.path.isfile(i):
             all_files[i] = 1;
-            if i[-8:] == ".changes":
+            if i.endswith(".changes"):
                 changes_files.append(i);
 
     # Proces all .changes and .dsc files.
@@ -120,7 +134,7 @@ def flush_orphans ():
 
         dsc_files = {};
         for file in files.keys():
-            if file[-4:] == ".dsc":
+            if file.endswith(".dsc"):
                 try:
                     dsc = utils.parse_changes(file);
                     dsc_files = utils.build_file_list(dsc, is_a_dsc=1);
@@ -183,10 +197,11 @@ def main ():
         print "Processing incoming..."
     flush_orphans();
 
-    if os.path.exists("REJECT") and os.path.isdir("REJECT"):
+    reject = Cnf["Dir::Queue::Reject"]
+    if os.path.exists(reject) and os.path.isdir(reject):
         if Options["Verbose"]:
             print "Processing incoming/REJECT..."
-        os.chdir("REJECT");
+        os.chdir(reject);
         flush_old();
 
 #######################################################################################