From: Mike O'Connor <stew@ries.debian.org>
Date: Tue, 10 Nov 2009 16:21:55 +0000 (+0000)
Subject: it at least gets to examine_package now
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=a227189c4ec2b6b285e871056006c7d70a2f2ec0;hp=648aa7bb0b2cc314deb823322ad4782be7633da8;p=dak.git

it at least gets to examine_package now
---

diff --git a/dak/process_new.py b/dak/process_new.py
index 67034f31..5381f8dd 100755
--- a/dak/process_new.py
+++ b/dak/process_new.py
@@ -77,7 +77,7 @@ Sections = None
 ################################################################################
 
 def recheck(upload, session):
-    upload.recheck()
+# STU: I'm not sure, but I don't thin kthis is necessary any longer:    upload.recheck(session)
     if len(upload.rejects) > 0:
         answer = "XXX"
         if Options["No-Action"] or Options["Automatic"] or Options["Trainee"]:
@@ -599,6 +599,7 @@ def prod_maintainer (note, upload):
 def do_new(upload, session):
     print "NEW\n"
     files = upload.pkg.files
+    upload.check_files(not Options["No-Action"])
     changes = upload.pkg.changes
     cnf = Config()
 
@@ -836,7 +837,7 @@ def move_file_to_queue(to_q, f, session=None):
 @session_wrapper
 def changes_to_unchecked(changes, session=None):
     """move a changes file to unchecked"""
-    unchecked = get_queue( 'uncecked' )
+    unchecked = get_policy_queue('unchecked', session );
     changes.in_queue = unchecked
 
     for f in changes.files:
@@ -868,9 +869,13 @@ def do_accept(upload):
             _accept(upload)
 
 def do_pkg(changes_file, session):
+    new_queue = get_policy_queue('new', session );
     u = Upload()
-    u.pkg.load_dot_dak(changes_file)
-    u.update_subst()
+    u.pkg.changes_file = changes_file
+    u.load_changes(changes_file)
+    u.pkg.directory = new_queue.path
+    u.logger = Logger
+    origchanges = os.path.abspath(u.pkg.changes_file)
 
     cnf = Config()
     bcc = "X-DAK: dak process-new"
@@ -886,21 +891,23 @@ def do_pkg(changes_file, session):
             if not recheck(u, session):
                 return
 
-            (new, byhand) = check_status(files)
-            if new or byhand:
-                if new:
-                    do_new(u, session)
-                if byhand:
-                    do_byhand(u, session)
-                (new, byhand) = check_status(files)
-
-            if not new and not byhand:
-                try:
-                    check_daily_lock()
-                    do_accept(u)
-                except CantGetLockError:
-                    print "Hello? Operator! Give me the number for 911!"
-                    print "Dinstall in the locked area, cant process packages, come back later"
+            do_new(u,session)
+
+#             (new, byhand) = check_status(files)
+#             if new or byhand:
+#                 if new:
+#                     do_new(u, session)
+#                 if byhand:
+#                     do_byhand(u, session)
+#                 (new, byhand) = check_status(files)
+
+#             if not new and not byhand:
+#                 try:
+#                     check_daily_lock()
+#                     do_accept(u)
+#                 except CantGetLockError:
+#                     print "Hello? Operator! Give me the number for 911!"
+#                     print "Dinstall in the locked area, cant process packages, come back later"
     except AlreadyLockedError, e:
         print "Seems to be locked by %s already, skipping..." % (e)
 
@@ -925,10 +932,6 @@ def end():
 def main():
     global Options, Logger, Sections, Priorities
 
-    print "NO NEW PROCESSING CURRENTLY AVAILABLE"
-    print "(Go and do something more interesting)"
-    sys.exit(0)
-
     cnf = Config()
     session = DBConn().session()
 
@@ -944,7 +947,8 @@ def main():
 
     changes_files = apt_pkg.ParseCommandLine(cnf.Cnf,Arguments,sys.argv)
     if len(changes_files) == 0:
-        changes_files = utils.get_changes_files(cnf["Dir::Queue::New"])
+        new_queue = get_policy_queue('new', session );
+        changes_files = utils.get_changes_files(new_queue.path)
 
     Options = cnf.SubTree("Process-New::Options")
 
diff --git a/daklib/queue.py b/daklib/queue.py
index 25890367..d97b99f5 100644
--- a/daklib/queue.py
+++ b/daklib/queue.py
@@ -115,8 +115,8 @@ def determine_new(changes, files, warn=1):
     # Build up a list of potentially new things
     for name, f in files.items():
         # Skip byhand elements
-        if f["type"] == "byhand":
-            continue
+#        if f["type"] == "byhand":
+#            continue
         pkg = f["package"]
         priority = f["priority"]
         section = f["section"]
@@ -218,7 +218,7 @@ def check_valid(new):
 def check_status(files):
     new = byhand = 0
     for f in files.keys():
-        if files[f]["type"] == "byhand":
+        if files[f].has_key("byhand"):
             byhand = 1
         elif files[f].has_key("new"):
             new = 1