import sys
import apt_pkg
+import os
from daklib.config import Config
from daklib.dbconn import *
from daklib import daklog
from daklib import utils
+from daklib.queue import get_suite_version_by_package, get_suite_version_by_source
#######################################################################################
old = {}
current = {}
+ Cnf = utils.get_conf()
try:
q = session.execute("SELECT changelog FROM suite WHERE id = :suiteid", \
except:
brit_file = None
- if not brit_file:
+ if brit_file:
+ brit_file = os.path.join(Cnf['Dir::Root'], brit_file)
+ else:
return
q = session.execute("""SELECT s.source, s.version, sa.id
#######################################################################################
-def set_suite(file, suite, session, britney=False):
+def version_checks(package, architecture, target_suite, new_version, session, force = False):
+ if architecture == "source":
+ suite_version_list = get_suite_version_by_source(package, session)
+ else:
+ suite_version_list = get_suite_version_by_package(package, architecture, session)
+
+ must_be_newer_than = [ vc.reference.suite_name for vc in get_version_checks(target_suite, "MustBeNewerThan") ]
+ must_be_older_than = [ vc.reference.suite_name for vc in get_version_checks(target_suite, "MustBeOlderThan") ]
+
+ # Must be newer than an existing version in target_suite
+ if target_suite not in must_be_newer_than:
+ must_be_newer_than.append(target_suite)
+
+ violations = False
+
+ for suite, version in suite_version_list:
+ cmp = apt_pkg.VersionCompare(new_version, version)
+ if suite in must_be_newer_than and cmp < 1:
+ utils.warn("%s (%s): version check violated: %s targeted at %s is *not* newer than %s in %s" % (package, architecture, new_version, target_suite, version, suite))
+ violations = True
+ if suite in must_be_older_than and cmp > 1:
+ utils.warn("%s (%s): version check violated: %s targeted at %s is *not* older than %s in %s" % (package, architecture, new_version, target_suite, version, suite))
+ violations = True
+
+ if violations:
+ if force:
+ utils.warn("Continuing anyway (forced)...")
+ else:
+ utils.fubar("Aborting. Version checks violated and not forced.")
+
+#######################################################################################
+
+def cmp_package_version(a, b):
+ """
+ comparison function for tuples of the form (package-name, version ...)
+ """
+ cmp_package = cmp(a[0], b[0])
+ if cmp_package != 0:
+ return cmp_package
+ return apt_pkg.VersionCompare(a[1], b[1])
+
+#######################################################################################
+
+def set_suite(file, suite, session, britney=False, force=False):
suite_id = suite.suite_id
lines = file.readlines()
FROM binaries b, bin_associations ba, architecture a
WHERE ba.suite = :suiteid
AND ba.bin = b.id AND b.architecture = a.id""", {'suiteid': suite_id})
- for i in q.fetchall():
- key = " ".join(i[:3])
+ for i in q:
+ key = i[:3]
current[key] = i[3]
- q = session.execute("""SELECT s.source, s.version, sa.id
+ q = session.execute("""SELECT s.source, s.version, 'source', sa.id
FROM source s, src_associations sa
WHERE sa.suite = :suiteid
AND sa.source = s.id""", {'suiteid': suite_id})
- for i in q.fetchall():
- key = " ".join(i[:2]) + " source"
- current[key] = i[2]
+ for i in q:
+ key = i[:3]
+ current[key] = i[3]
# Build up a dictionary of what should be in the suite
- desired = {}
+ desired = set()
for line in lines:
split_line = line.strip().split()
if len(split_line) != 3:
utils.warn("'%s' does not break into 'package version architecture'." % (line[:-1]))
continue
- key = " ".join(split_line)
- desired[key] = ""
-
- # Check to see which packages need removed and remove them
- for key in current.keys():
- if not desired.has_key(key):
- (package, version, architecture) = key.split()
- pkid = current[key]
- if architecture == "source":
- session.execute("""DELETE FROM src_associations WHERE id = :pkid""", {'pkid': pkid})
- else:
- session.execute("""DELETE FROM bin_associations WHERE id = :pkid""", {'pkid': pkid})
- Logger.log(["removed", key, pkid])
+ desired.add(tuple(split_line))
# Check to see which packages need added and add them
- for key in desired.keys():
- if not current.has_key(key):
- (package, version, architecture) = key.split()
+ for key in sorted(desired, cmp=cmp_package_version):
+ if key not in current:
+ (package, version, architecture) = key
+ version_checks(package, architecture, suite.suite_name, version, session, force)
pkid = get_id (package, version, architecture, session)
if not pkid:
continue
else:
session.execute("""INSERT INTO bin_associations (suite, bin)
VALUES (:suiteid, :pkid)""", {'suiteid': suite_id, 'pkid': pkid})
- Logger.log(["added", key, pkid])
+ Logger.log(["added", " ".join(key), pkid])
+
+ # Check to see which packages need removed and remove them
+ for key, pkid in current.iteritems():
+ if key not in desired:
+ (package, version, architecture) = key
+ if architecture == "source":
+ session.execute("""DELETE FROM src_associations WHERE id = :pkid""", {'pkid': pkid})
+ else:
+ session.execute("""DELETE FROM bin_associations WHERE id = :pkid""", {'pkid': pkid})
+ Logger.log(["removed", " ".join(key), pkid])
session.commit()
#######################################################################################
-def process_file(file, suite, action, session, britney=False):
+def process_file(file, suite, action, session, britney=False, force=False):
if action == "set":
- set_suite(file, suite, session, britney)
+ set_suite(file, suite, session, britney, force)
return
suite_id = suite.suite_id
- lines = file.readlines()
+ request = []
# Our session is already in a transaction
- for line in lines:
+ for line in file:
split_line = line.strip().split()
if len(split_line) != 3:
utils.warn("'%s' does not break into 'package version architecture'." % (line[:-1]))
continue
+ request.append(split_line)
- (package, version, architecture) = split_line
+ request.sort(cmp=cmp_package_version)
+ for package, version, architecture in request:
pkid = get_id(package, version, architecture, session)
if not pkid:
continue
+ # Do version checks when adding packages
+ if action == "add":
+ version_checks(package, architecture, suite.suite_name, version, session, force)
+
if architecture == "source":
# Find the existing association ID, if any
q = session.execute("""SELECT id FROM src_associations
Arguments = [('a',"add","Control-Suite::Options::Add", "HasArg"),
('b',"britney","Control-Suite::Options::Britney"),
+ ('f','force','Control-Suite::Options::Force'),
('h',"help","Control-Suite::Options::Help"),
('l',"list","Control-Suite::Options::List","HasArg"),
('r',"remove", "Control-Suite::Options::Remove", "HasArg"),
try:
file_list = apt_pkg.ParseCommandLine(cnf.Cnf, Arguments, sys.argv);
- except SystemError, e:
+ except SystemError as e:
print "%s\n" % e
usage(1)
Options = cnf.SubTree("Control-Suite::Options")
session = DBConn().session()
+ force = Options.has_key("Force") and Options["Force"]
+
action = None
for i in ("add", "list", "remove", "set"):
# Safety/Sanity check
# XXX: This should be stored in the database
- if action == "set" and suite_name not in ["testing"]:
+ if action == "set" and suite_name not in ["testing", "squeeze-updates"]:
utils.fubar("Will not reset suite %s" % (suite_name))
britney = False
if action == "list":
get_list(suite, session)
else:
- Logger = daklog.Logger(cnf.Cnf, "control-suite")
+ Logger = daklog.Logger("control-suite")
if file_list:
for f in file_list:
- process_file(utils.open_file(f), suite, action, session, britney)
+ process_file(utils.open_file(f), suite, action, session, britney, force)
else:
- process_file(sys.stdin, suite, action, session, britney)
+ process_file(sys.stdin, suite, action, session, britney, force)
Logger.close()
#######################################################################################
projects / dak.git / blobdiff