[aj] make SoE work. [me] don't overwrite files ever; use dated sub directories in...

diff --git a/rhona b/rhona
index c080a71ddf087cb67718e55751e988b433cae053..e3f5c022a2dfcf353e0e6d5183f5cc37ed3576e8 100755 (executable)
--- a/rhona
+++ b/rhona
@@ -2,7 +2,7 @@
 
 # rhona, cleans up unassociated binary and source packages
 # Copyright (C) 2000, 2001  James Troup <james@nocrew.org>
-# $Id: rhona,v 1.13 2001-03-20 00:28:11 troup Exp $
+# $Id: rhona,v 1.14 2001-05-31 02:19:30 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
@@ -37,9 +37,12 @@ import utils
 
 projectB = None
 Cnf = None
-delete_date = None;
+now_date = None;     # mark newly "deleted" things as deleted "now"
+delete_date = None;  # delete things marked "deleted" earler than this
 overrides = {};
 
+tried_too_hard_exc = "Tried too hard to find a free filename for %s; something's gone Pete Tong";
+
 ###################################################################################################
 
 def usage (exit_code):
@@ -52,10 +55,21 @@ def usage (exit_code):
 
 ###################################################################################################
 
+def find_next_free (dest):
+    extra = 0;
+    orig_dest = dest;
+    too_much = 100;
+    while os.path.exists(dest) and extra < too_much:
+        dest = orig_dest + '.' + repr(extra);
+        extra = extra + 1;
+    if extra >= too_much:
+        raise tried_too_hard_exc;
+    return dest;
+    
 # FIXME: why can't we make (sane speed) UPDATEs out of these SELECTs?
 
 def check_binaries():
-    global delete_date;
+    global delete_date, now_date;
     
     print "Checking for orphaned binary packages..."
 
@@ -70,7 +84,7 @@ SELECT b.file FROM binaries b WHERE NOT EXISTS
     projectB.query("BEGIN WORK");
     for i in ql:
         file_id = i[0];
-        projectB.query("UPDATE files SET last_used = '%s' WHERE id = %s" % (delete_date, file_id))
+        projectB.query("UPDATE files SET last_used = '%s' WHERE id = %s AND last_used IS NULL" % (now_date, file_id))
     projectB.query("COMMIT WORK");
 
     # Check for any binaries which are marked for eventual deletion
@@ -88,7 +102,7 @@ SELECT b.file FROM binaries b, files f
     projectB.query("COMMIT WORK");
 
 def check_sources():
-    global delete_date;
+    global delete_date, now_date;
 
     print "Checking for orphaned source packages..."
 
@@ -100,6 +114,11 @@ SELECT s.id, s.file FROM source s
   WHERE NOT EXISTS
    (SELECT sa.suite FROM src_associations sa WHERE sa.source = s.id)
   AND NOT EXISTS (SELECT b.id FROM binaries b WHERE b.source = s.id)""");
+
+    #### XXX: this should ignore cases where the files for the binary b
+    ####      have been marked for deletion (so the delay between bins go
+    ####      byebye and sources go byebye is 0 instead of StayOfExecution)
+
     ql = q.getresult();
     
     projectB.query("BEGIN WORK");
@@ -108,14 +127,14 @@ SELECT s.id, s.file FROM source s
         dsc_file_id = i[1];
 
         # Mark the .dsc file for deletion
-        projectB.query("UPDATE files SET last_used = '%s' WHERE id = %s" % (delete_date, dsc_file_id))
+        projectB.query("UPDATE files SET last_used = '%s' WHERE id = %s AND last_used IS NULL" % (now_date, dsc_file_id))
         # Mark all other files references by .dsc too if they're not used by anyone else
         x = projectB.query("SELECT f.id FROM files f, dsc_files d WHERE d.source = %s AND d.file = f.id" % (source_id));
         for j in x.getresult():
             file_id = j[0];
             y = projectB.query("SELECT id FROM dsc_files d WHERE d.file = %s" % (file_id));
             if len(y.getresult()) == 1:
-                projectB.query("UPDATE files SET last_used = '%s' WHERE id = %s" % (delete_date, file_id));
+                projectB.query("UPDATE files SET last_used = '%s' WHERE id = %s AND last_used IS NULL" % (now_date, file_id));
     projectB.query("COMMIT WORK");
 
     # Check for any sources which are marked for deletion but which
@@ -126,6 +145,10 @@ SELECT f.id FROM source s, files f, dsc_files df
   WHERE f.last_used IS NOT NULL AND s.id = df.source AND df.file = f.id
     AND ((EXISTS (SELECT sa.suite FROM src_associations sa WHERE sa.source = s.id))
       OR (EXISTS (SELECT b.id FROM binaries b WHERE b.source = s.id)))""");
+
+    #### XXX: this should also handle deleted binaries specially (ie, not
+    ####      reinstate sources because of them
+
     ql = q.getresult();
     # Could be done in SQL; but left this way for hysterical raisins
     # [and freedom to innovate don'cha know?]
@@ -136,7 +159,7 @@ SELECT f.id FROM source s, files f, dsc_files df
     projectB.query("COMMIT WORK");
 
 def check_files():
-    global delete_date;
+    global delete_date, now_date;
 
     # FIXME: this is evil; nothing should ever be in this state.  if
     # they are, it's a bug and the files should not be auto-deleted.
@@ -153,15 +176,17 @@ SELECT id FROM files f
     projectB.query("BEGIN WORK");
     for i in q.getresult():
         file_id = i[0];
-        projectB.query("UPDATE files SET last_used = '%s' WHERE id = %s" % (delete_date, file_id));
+        projectB.query("UPDATE files SET last_used = '%s' WHERE id = %s" % (now_date, file_id));
     projectB.query("COMMIT WORK");
     
 def clean_binaries():
-    global delete_date;
+    global delete_date, now_date;
 
     # We do this here so that the binaries we remove will have their
     # source also removed (if possible).
 
+    # XXX: why doesn't this remove the files here as well? I don't think it
+    #      buys anything keeping this separate
     print "Cleaning binaries from the DB..."
     if not Cnf["Rhona::Options::No-Action"]:
         before = time.time();
@@ -170,14 +195,14 @@ def clean_binaries():
         sys.stdout.write("done. (%d seconds)]\n" % (int(time.time()-before)));
 
 def clean():
-    global delete_date;
+    global delete_date, now_date;
     count = 0;
     size = 0;
 
     print "Cleaning out packages..."
 
-    # Ensure destination directory exists
-    dest = Cnf["Dir::Morgue"] + '/' + Cnf["Rhona::MorgueSubDir"];
+    date = time.strftime("%Y-%m-%d", time.localtime(time.time()));
+    dest = Cnf["Dir::Morgue"] + '/' + Cnf["Rhona::MorgueSubDir"] + '/' + date;
     if not os.path.exists(dest):
         os.mkdir(dest);
         
@@ -206,14 +231,21 @@ def clean():
             else:
                 size = size + os.stat(filename)[stat.ST_SIZE];
                 count = count + 1;
+
+                dest_filename = dest + '/' + os.path.basename(filename);
+                # If the destination file exists; try to find another filename to use
+                if os.path.exists(dest_filename):
+                    dest_filename = find_next_free(dest_filename);
+                
                 if Cnf["Rhona::Options::No-Action"]:
-                    print "Cleaning %s to %s..." % (filename, dest);
+                    print "Cleaning %s -> %s ..." % (filename, dest_filename);
                 else:
-                    utils.move(filename, dest);
+                    utils.move(filename, dest_filename);
         else:
             sys.stderr.write("%s is neither symlink nor file?!\n" % (filename));
             sys.exit(1);
-    # delete from files
+            
+    # Delete from the 'files' table
     if not Cnf["Rhona::Options::No-Action"]:
         before = time.time();
         sys.stdout.write("[Deleting from files table... ");
@@ -244,7 +276,7 @@ SELECT m.id FROM maintainer m
         sys.stderr.write("Cleared out %d maintainer entries.\n" % (count));
 
 def main():
-    global Cnf, projectB, delete_date;
+    global Cnf, projectB, delete_date, now_date;
     
     apt_pkg.init();
     
@@ -272,6 +304,7 @@ def main():
     if not os.access(override_filename, os.R_OK):
         sys.stderr.write("W: Could not find source-only override file '%s'.\n" % (override_filename));
 
+    now_date = time.strftime("%Y-%m-%d %H:%M", time.localtime(time.time()));
     delete_date = time.strftime("%Y-%m-%d %H:%M", time.localtime(time.time()-int(Cnf["Rhona::StayOfExecution"])));
     
     check_binaries();

diff --git a/utils.py b/utils.py
index 95a0882633dfb690d0f070cfa36102d5f91afcd6..ae796855e959922ee40607e775c839decdbd6fd2 100644 (file)
--- a/utils.py
+++ b/utils.py
@@ -1,6 +1,6 @@
 # Utility functions
 # Copyright (C) 2000  James Troup <james@nocrew.org>
-# $Id: utils.py,v 1.23 2001-05-24 18:56:23 troup Exp $
+# $Id: utils.py,v 1.24 2001-05-31 02:19:30 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
@@ -42,7 +42,8 @@ no_files_exc = "No Files: field in .dsc file.";
 cant_open_exc = "Can't read file.";
 unknown_hostname_exc = "Unknown hostname";
 cant_overwrite_exc = "Permission denied; can't overwrite existent file."
-       
+file_exists_exc = "Destination file exists";
+
 ######################################################################################
 
 def open_file(filename, mode):
@@ -287,7 +288,7 @@ def poolify (source, component):
 
 ######################################################################################
 
-def move (src, dest):
+def move (src, dest, overwrite = 0):
     if os.path.exists(dest) and os.path.isdir(dest):
        dest_dir = dest;
     else:
@@ -299,14 +300,18 @@ def move (src, dest):
     #print "Moving %s to %s..." % (src, dest);
     if os.path.exists(dest) and os.path.isdir(dest):
        dest = dest + '/' + os.path.basename(src);
-    # Check for overwrite permission on existent files
-    if os.path.exists(dest) and not os.access(dest, os.W_OK):
-        raise cant_overwrite_exc
+    # Don't overwrite unless forced to
+    if os.path.exists(dest):
+        if not overwrite:
+            raise file_exists_exc;
+        else:
+            if not os.access(dest, os.W_OK):
+                raise cant_overwrite_exc
     shutil.copy2(src, dest);
     os.chmod(dest, 0664);
     os.unlink(src);
 
-def copy (src, dest):
+def copy (src, dest, overwrite = 0):
     if os.path.exists(dest) and os.path.isdir(dest):
        dest_dir = dest;
     else:
@@ -318,8 +323,13 @@ def copy (src, dest):
     #print "Copying %s to %s..." % (src, dest);
     if os.path.exists(dest) and os.path.isdir(dest):
        dest = dest + '/' + os.path.basename(src);
-    if os.path.exists(dest) and not os.access(dest, os.W_OK):
-        raise cant_overwrite_exc
+    # Don't overwrite unless forced to
+    if os.path.exists(dest):
+        if not overwrite:
+            raise file_exists_exc
+        else:
+            if not os.access(dest, os.W_OK):
+                raise cant_overwrite_exc
     shutil.copy2(src, dest);
     os.chmod(dest, 0664);