Start fixing up byhand

Signed-off-by: Mark Hymers <mhy@debian.org>

diff --git a/dak/process_new.py b/dak/process_new.py
index 041a60e09d198748f13785881104e5084e18facb..ff0c26400090478d215c99f14a9f266c2403427a 100755 (executable)
--- 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 6d6469184b20d4af1e27a4e22a0c0331564d0139..6e6cb863a7cb80d60f8ca07d1c72ebde8f8c6ef4 100755 (executable)
--- 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 c045c19eaa60eeecd43aa5b9e9608011cdddc48a..e04b80ac26b50b18c9c3c4759112e3300f7d9569 100755 (executable)
--- 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 bc1b873997620854e768647aaeae0644d9d5df10..d016c98638619ed9888333c6d8bf907d806a030f 100755 (executable)
--- 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