#!/usr/bin/env python
# Clean incoming of old unused files
-# Copyright (C) 2000, 2001 James Troup <james@nocrew.org>
-# $Id: shania,v 1.7 2001-11-14 05:06:14 rmurray Exp $
+# Copyright (C) 2000, 2001, 2002 James Troup <james@nocrew.org>
+# $Id: shania,v 1.14 2002-05-08 11:13:02 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
################################################################################
-import os, re, stat, string, sys, time, traceback
-import utils
+import os, stat, sys, time;
+import utils;
import apt_pkg;
################################################################################
Cnf = None;
Options = None;
del_dir = None;
+delete_date = None;
################################################################################
# Move to the directory to clean
incoming = Options["Incoming"];
if incoming == "":
- incoming = Cnf["Dir::IncomingDir"];
+ incoming = Cnf["Dir::Queue::Unchecked"];
os.chdir(incoming);
# Remove a file to the morgue
# 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, 10);
- utils.move(file, dest_filename);
+ utils.move(file, dest_filename, 0660);
else:
utils.warn("skipping '%s', permission denied." % (os.path.basename(file)));
changes = utils.parse_changes(changes_filename, 0)
files = utils.build_file_list(changes, "");
except:
- utils.warn("error processing '%s'; skipping it. [Got %s]" % (file, sys.exc_type));
+ utils.warn("error processing '%s'; skipping it. [Got %s]" % (changes_filename, sys.exc_type));
continue;
dsc_files = {};
def main ():
global Cnf, Options;
- apt_pkg.init();
+ Cnf = utils.get_conf()
- Cnf = apt_pkg.newConfiguration();
- apt_pkg.ReadConfigFileISC(Cnf,utils.which_conf_file());
+ for i in ["Help", "Incoming", "No-Action", "Verbose" ]:
+ if not Cnf.has_key("Shania::Options::%s" % (i)):
+ Cnf["Shania::Options::%s" % (i)] = "";
+ if not Cnf.has_key("Shania::Options::Days"):
+ Cnf["Shania::Options::Days"] = "14";
Arguments = [('h',"help","Shania::Options::Help"),
- ('d',"days","Shania::Options::Days", "IntVal"),
+ ('d',"days","Shania::Options::Days", "IntLevel"),
('i',"incoming","Shania::Options::Incoming", "HasArg"),
('n',"no-action","Shania::Options::No-Action"),
('v',"verbose","Shania::Options::Verbose")];
- for i in ["Help", "Incoming", "No-Action", "Verbose" ]:
- Cnf["Shania::Options::%s" % (i)] = "";
- Cnf["Shania::Options::Days"] = 14;
apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv);
Options = Cnf.SubTree("Shania::Options")