X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=rhona;h=50c53b69c1f55a48d18ceb1c69068029995ec956;hb=6cc79b7b093af0c68c9d80c61d5aa7cfe72c9188;hp=83f3da44ae10834b3f8ef42d2372bb1e3e720b5c;hpb=b037a167deff2cb93e39e6baa11dd23a73ba98e1;p=dak.git

diff --git a/rhona b/rhona
index 83f3da44..50c53b69 100755
--- a/rhona
+++ b/rhona
@@ -1,8 +1,8 @@
 #!/usr/bin/env python
 
 # rhona, cleans up unassociated binary and source packages
-# Copyright (C) 2000, 2001  James Troup <james@nocrew.org>
-# $Id: rhona,v 1.22 2002-04-24 01:56:24 troup Exp $
+# Copyright (C) 2000, 2001, 2002  James Troup <james@nocrew.org>
+# $Id: rhona,v 1.26 2003-01-02 18:13:41 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
@@ -185,7 +185,7 @@ def clean():
 
     print "Cleaning out packages..."
 
-    date = time.strftime("%Y-%m-%d", time.localtime(time.time()));
+    date = time.strftime("%Y-%m-%d");
     dest = Cnf["Dir::Morgue"] + '/' + Cnf["Rhona::MorgueSubDir"] + '/' + date;
     if not os.path.exists(dest):
         os.mkdir(dest);
@@ -207,14 +207,14 @@ def clean():
             continue;
         if os.path.isfile(filename):
             if os.path.islink(filename):
-                count = count + 1;
+                count += 1;
                 if Options["No-Action"]:
                     print "Removing symlink %s..." % (filename);
                 else:
                     os.unlink(filename);
             else:
-                size = size + os.stat(filename)[stat.ST_SIZE];
-                count = count + 1;
+                size += os.stat(filename)[stat.ST_SIZE];
+                count += 1;
 
                 dest_filename = dest + '/' + os.path.basename(filename);
                 # If the destination file exists; try to find another filename to use
@@ -254,7 +254,7 @@ SELECT m.id FROM maintainer m
         maintainer_id = i[0];
         if not Options["No-Action"]:
             projectB.query("DELETE FROM maintainer WHERE id = %s" % (maintainer_id));
-            count = count + 1;
+            count += 1;
     projectB.query("COMMIT WORK");
 
     if count > 0:
@@ -277,7 +277,7 @@ SELECT f.id FROM fingerprint f
         fingerprint_id = i[0];
         if not Options["No-Action"]:
             projectB.query("DELETE FROM fingerprint WHERE id = %s" % (fingerprint_id));
-            count = count + 1;
+            count += 1;
     projectB.query("COMMIT WORK");
 
     if count > 0:
@@ -288,7 +288,7 @@ SELECT f.id FROM fingerprint f
 def clean_accepted_autobuild():
     global now_date;
 
-    if not Cnf.get("Dinstall::SpecialAcceptedAutoBuild") or Options["No-Action"]:
+    if not Cnf.ValueList("Dinstall::AcceptedAutoBuildSuites") or Options["No-Action"]:
         return;
 
     print "Cleaning out accepted autobuild symlinks..."
@@ -296,19 +296,20 @@ def clean_accepted_autobuild():
     our_delete_date = time.strftime("%Y-%m-%d %H:%M", time.localtime(time.time()-int(Cnf["Rhona::AcceptedAutoBuildStayOfExecution"])));
     count = 0;
 
-    q = projectB.query("SELECT filename FROM unstable_accepted WHERE last_used <= '%s'" % (our_delete_date));
+    q = projectB.query("SELECT filename FROM accepted_autobuild WHERE last_used <= '%s'" % (our_delete_date));
     for i in q.getresult():
         filename = i[0];
         if not os.path.exists(filename):
-            utils.fubar("%s (from unstable_accepted) doesn't exist." % (filename));
-        if not os.path.islink(filename):
-            utils.fubar("%s (from unstable_accepted) should be a symlink but isn't." % (filename));
+            utils.warn("%s (from accepted_autobuild) doesn't exist." % (filename));
+            continue;
+        if not Cnf.FindB("Dinstall::SecurityAcceptedAutoBuild") and not os.path.islink(filename):
+            utils.fubar("%s (from accepted_autobuild) should be a symlink but isn't." % (filename));
         os.unlink(filename);
-        count = count + 1;
-    projectB.query("DELETE FROM unstable_accepted WHERE last_used <= '%s'" % (our_delete_date));
+        count += 1;
+    projectB.query("DELETE FROM accepted_autobuild WHERE last_used <= '%s'" % (our_delete_date));
 
-    if count > 0:
-        sys.stderr.write("Cleaned %d accepted-autobuild symlinks.\n" % (count));
+    if count:
+        sys.stderr.write("Cleaned %d accepted-autobuild files.\n" % (count));
 
 ################################################################################
 
@@ -320,8 +321,6 @@ def main():
 	if not Cnf.has_key("Rhona::Options::%s" % (i)):
 	    Cnf["Rhona::Options::%s" % (i)] = "";
 
-    projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"], int(Cnf["DB::Port"]));
-
     Arguments = [('h',"help","Rhona::Options::Help"),
                  ('n',"no-action","Rhona::Options::No-Action")];
 
@@ -331,7 +330,9 @@ def main():
     if Options["Help"]:
         usage();
 
-    now_date = time.strftime("%Y-%m-%d %H:%M", time.localtime(time.time()));
+    projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"], int(Cnf["DB::Port"]));
+
+    now_date = time.strftime("%Y-%m-%d %H:%M");
     delete_date = time.strftime("%Y-%m-%d %H:%M", time.localtime(time.time()-int(Cnf["Rhona::StayOfExecution"])));
 
     check_binaries();