#!/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.24 2002-05-23 12:18: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
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..."
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));
+ 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));
################################################################################