# Utility functions for katie
# Copyright (C) 2001, 2002 James Troup <james@nocrew.org>
-# $Id: katie.py,v 1.20 2002-05-14 15:35:22 troup Exp $
+# $Id: katie.py,v 1.23 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
exec "%s = self.pkg.%s;" % (i,i);
dump_filename = os.path.join(dest_dir,self.pkg.changes_file[:-8] + ".katie");
dump_file = utils.open_file(dump_filename, 'w');
+ try:
+ os.chmod(dump_filename, 0660);
+ except OSError, e:
+ if errno.errorcode[e.errno] == 'EPERM':
+ perms = stat.S_IMODE(os.stat(dump_filename)[stat.ST_MODE]);
+ if perms & stat.S_IROTH:
+ utils.fubar("%s is world readable and chmod failed." % (dump_filename));
+ else:
+ raise;
+
p = cPickle.Pickler(dump_file, 1);
for i in [ "d_changes", "d_dsc", "d_files", "d_dsc_files" ]:
exec "%s = {}" % i;
d_changes[i] = changes[i];
# Optional changes fields
# FIXME: changes should be mandatory
- for i in [ "changed-by", "maintainer822", "filecontents", "format", "changes" ]:
+ for i in [ "changed-by", "maintainer822", "filecontents", "format",
+ "changes", "lisa note" ]:
if changes.has_key(i):
d_changes[i] = changes[i];
## dsc
Subst = self.Subst;
Cnf = self.Cnf;
changes = self.pkg.changes;
- dsc = self.pkg.dsc;
# Only do announcements for source uploads with a recent dpkg-dev installed
if float(changes.get("format", 0)) < 1.6 or not changes["architecture"].has_key("source"):
self.announce(short_summary, 1)
# Special support to enable clean auto-building of accepted packages
- if Cnf.FindB("Dinstall::SpecialAcceptedAutoBuild") and \
- self.pkg.changes["distribution"].has_key("unstable"):
- self.projectB.query("BEGIN WORK");
+ self.projectB.query("BEGIN WORK");
+ for suite in self.pkg.changes["distribution"].keys():
+ if suite not in Cnf.ValueList("Dinstall::AcceptedAutoBuildSuites"):
+ continue;
+ suite_id = db_access.get_suite_id(suite);
+ dest_dir = Cnf["Dir::AcceptedAutoBuild"];
+ if Cnf.FindB("Dinstall::SecurityAcceptedAutoBuild"):
+ dest_dir = os.path.join(dest_dir, suite);
for file in file_keys:
src = os.path.join(Cnf["Dir::Queue::Accepted"], file);
- dest = os.path.join(Cnf["Dir::AcceptedAutoBuild"], file);
- # Create a symlink to it
- os.symlink(src, dest);
+ dest = os.path.join(dest_dir, file);
+ if Cnf.FindB("Dinstall::SecurityAcceptedAutoBuild"):
+ # Copy it since the original won't be readable by www-data
+ utils.copy(src, dest);
+ else:
+ # Create a symlink to it
+ os.symlink(src, dest);
# Add it to the list of packages for later processing by apt-ftparchive
- self.projectB.query("INSERT INTO unstable_accepted (filename, in_accepted) VALUES ('%s', 't')" % (dest));
+ self.projectB.query("INSERT INTO accepted_autobuild (suite, filename, in_accepted) VALUES (%s, '%s', 't')" % (suite_id, dest));
# If the .orig.tar.gz is in the pool, create a symlink to
# it (if one doesn't already exist)
if self.pkg.orig_tar_id:
for dsc_file in self.pkg.dsc_files.keys():
if dsc_file[-12:] == ".orig.tar.gz":
filename = dsc_file;
- dest = os.path.join(Cnf["Dir::AcceptedAutoBuild"],filename);
+ dest = os.path.join(dest_dir, filename);
# If it doesn't exist, create a symlink
if not os.path.exists(dest):
# Find the .orig.tar.gz in the pool
src = os.path.join(ql[0][0], ql[0][1]);
os.symlink(src, dest);
# Add it to the list of packages for later processing by apt-ftparchive
- self.projectB.query("INSERT INTO unstable_accepted (filename, in_accepted) VALUES ('%s', 't')" % (dest));
+ self.projectB.query("INSERT INTO accepted_autobuild (suite, filename, in_accepted) VALUES (%s, '%s', 't')" % (suite_id, dest));
+ # if it does, update things to ensure it's not removed prematurely
+ else:
+ self.projectB.query("UPDATE accepted_autobuild SET in_accepted = 't', last_used = NULL WHERE filename = '%s' AND suite = %s" % (dest, suite_id));
- self.projectB.query("COMMIT WORK");
+ self.projectB.query("COMMIT WORK");
###########################################################################