From: Mark Hymers Date: Sat, 18 Sep 2010 08:48:59 +0000 (+0000) Subject: Start fixing up byhand X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=17ac1736ee52da817fdff6e35c864947042f0ddb;p=dak Start fixing up byhand Signed-off-by: Mark Hymers --- diff --git a/dak/process_new.py b/dak/process_new.py index 041a60e0..ff0c2640 100755 --- a/dak/process_new.py +++ b/dak/process_new.py @@ -669,8 +669,13 @@ def do_pkg(changes_file, session): if not recheck(u, session): return - # FIXME: This does need byhand checks added! - new = determine_new(u.pkg.changes, files) + new, byhand = determine_new(u.pkg.changes, files) + if byhand: + # TODO: Fix this and make sure it doesn't complain when we've + # got already processed byhand components + print "Warning: This has byhand components and probably shouldn't be in NEW." + print "Contact an ftpmaster as this needs to be dealt with by them" + continue if new: do_new(u, session) else: diff --git a/dak/show_new.py b/dak/show_new.py index 6d646918..6e6cb863 100755 --- a/dak/show_new.py +++ b/dak/show_new.py @@ -172,7 +172,7 @@ def do_pkg(changes_file): u.check_source_against_db(deb_filename, session) u.pkg.changes["suite"] = u.pkg.changes["distribution"] - new = determine_new(u.pkg.changes, files, 0, session) + new, byhand = determine_new(u.pkg.changes, files, 0, session) htmlname = changes["source"] + "_" + changes["version"] + ".html" sources.add(htmlname) diff --git a/daklib/queue.py b/daklib/queue.py index c045c19e..e04b80ac 100755 --- a/daklib/queue.py +++ b/daklib/queue.py @@ -110,12 +110,14 @@ def determine_new(changes, files, warn=1, session = None): """ new = {} + byhand = {} # Build up a list of potentially new things for name, f in files.items(): - # Skip byhand elements -# if f["type"] == "byhand": -# continue + # Keep a record of byhand elements + if f["section"] == "byhand": + byhand[name] = 1 + continue pkg = f["package"] priority = f["priority"] section = f["section"] @@ -180,7 +182,7 @@ def determine_new(changes, files, warn=1, session = None): if new[pkg].has_key("othercomponents"): print "WARNING: %s already present in %s distribution." % (pkg, new[pkg]["othercomponents"]) - return new + return new, byhand ################################################################################ diff --git a/daklib/queue_install.py b/daklib/queue_install.py index bc1b8739..d016c986 100755 --- a/daklib/queue_install.py +++ b/daklib/queue_install.py @@ -254,7 +254,7 @@ def determine_target(u): # Statically handled queues target = None - for q in ["new", "autobyhand", "byhand"]: + for q in ["autobyhand", "byhand", "new"]: if QueueInfo[q]["is"](u): target = q break