# rhona, cleans up unassociated binary and source packages
# Copyright (C) 2000, 2001, 2002 James Troup <james@nocrew.org>
-# $Id: rhona,v 1.23 2002-05-08 11:13:30 troup Exp $
+# $Id: rhona,v 1.25 2002-10-16 02:47:32 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
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);
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
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:
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:
def clean_accepted_autobuild():
global now_date;
- if not Cnf.FindB("Dinstall::SpecialAcceptedAutoBuild") or Options["No-Action"]:
+ if not Cnf.ValueList("Dinstall::AcceptedAutoBuildSuites") or Options["No-Action"]:
return;
print "Cleaning out accepted autobuild symlinks..."
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));
################################################################################
if Options["Help"]:
usage();
- now_date = time.strftime("%Y-%m-%d %H:%M", time.localtime(time.time()));
+ 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();