X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=rhona;h=c7ee05bc92909685ee9b15125bb4314d293549e2;hb=0e9d5d8e31062edf50725735424fd89563ffa5a4;hp=dc9ef6abc6afdcda5c52ddbb5214be3633b3a115;hpb=c8bb93e9de4d48854f46c630be139889af32d91a;p=dak.git diff --git a/rhona b/rhona index dc9ef6ab..c7ee05bc 100755 --- a/rhona +++ b/rhona @@ -2,7 +2,7 @@ # rhona, cleans up unassociated binary and source packages # Copyright (C) 2000, 2001 James Troup -# $Id: rhona,v 1.11 2001-03-15 22:40:43 troup Exp $ +# $Id: rhona,v 1.16 2001-06-22 23:30:21 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,8 +37,8 @@ import utils projectB = None Cnf = None -delete_date = None; -overrides = {}; +now_date = None; # mark newly "deleted" things as deleted "now" +delete_date = None; # delete things marked "deleted" earler than this ################################################################################################### @@ -51,11 +51,9 @@ def usage (exit_code): sys.exit(exit_code) ################################################################################################### - -# 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 +68,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,18 +86,22 @@ 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..." - # Get the list of source packages not in a suite and not linked to - # by any binary packages. + # Get the list of source packages not in a suite. q = projectB.query(""" 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 +110,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 +128,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 +142,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 +159,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 +178,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); @@ -194,7 +202,7 @@ def clean(): for i in q.getresult(): filename = i[0] + i[1]; if not os.path.exists(filename): - sys.stderr.write("E: can not find %s.\n" % (filename)); + utils.warn("can not find '%s'." % (filename)); continue; if os.path.isfile(filename): if os.path.islink(filename): @@ -206,14 +214,20 @@ 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 = utils.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 + utils.fubar("%s is neither symlink nor file?!" % (filename)); + + # Delete from the 'files' table if not Cnf["Rhona::Options::No-Action"]: before = time.time(); sys.stdout.write("[Deleting from files table... "); @@ -244,15 +258,15 @@ 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; - projectB = pg.connect('projectB', 'localhost'); - apt_pkg.init(); Cnf = apt_pkg.newConfiguration(); apt_pkg.ReadConfigFileISC(Cnf,utils.which_conf_file()); + projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"], int(Cnf["DB::Port"])); + Arguments = [('D',"debug","Rhona::Options::Debug", "IntVal"), ('h',"help","Rhona::Options::Help"), ('n',"no-action","Rhona::Options::No-Action"), @@ -268,10 +282,7 @@ def main(): print "rhona version 0.0000000000"; usage(0); - override_filename = Cnf["Dir::OverrideDir"] + Cnf["Rhona::OverrideFilename"]; - 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();