Use a better name for function name and output string

[dak.git] / dak / process_new.py

diff --git a/dak/process_new.py b/dak/process_new.py
index 53b4bf7be608cb341dd128b78254123024c96611..ce1f1805049c3e06fbad787dcd18ec525aac5858 100755 (executable)
--- a/dak/process_new.py
+++ b/dak/process_new.py
@@ -64,7 +64,6 @@ from daklib.dak_exceptions import CantOpenError, AlreadyLockedError, CantGetLock
 from daklib.summarystats import SummaryStats
 from daklib.config import Config
 from daklib.policy import UploadCopy, PolicyQueueUploadHandler
 from daklib.summarystats import SummaryStats
 from daklib.config import Config
 from daklib.policy import UploadCopy, PolicyQueueUploadHandler

-from sqlalchemy.sql import not_

 
 # Globals
 Options = None
 
 # Globals
 Options = None


@@ -119,8 +118,7 @@ class Priority_Completer:
 
 ################################################################################
 
 
 ################################################################################
 

-def claimed_overrides(upload, missing, session):
-    source = [upload.source.source]
+def takenover_binaries(upload, missing, session):

     binaries = set([x.package for x in upload.binaries])
     suites = ('unstable','experimental')
     for m in missing:
     binaries = set([x.package for x in upload.binaries])
     suites = ('unstable','experimental')
     for m in missing:


@@ -130,7 +128,7 @@ def claimed_overrides(upload, missing, session):
         return session.query(DBBinary.package, DBSource.source).distinct(). \
                              filter(DBBinary.package.in_(binaries)). \
                              join(DBBinary.source). \
         return session.query(DBBinary.package, DBSource.source).distinct(). \
                              filter(DBBinary.package.in_(binaries)). \
                              join(DBBinary.source). \

-                             filter(not_(DBSource.source.in_(source))). \
+                             filter(DBSource.source != upload.source.source). \

                              join(DBBinary.suites). \
                              filter(Suite.suite_name.in_(suites)). \
                              order_by(DBSource.source, DBBinary.package)
                              join(DBBinary.suites). \
                              filter(Suite.suite_name.in_(suites)). \
                              order_by(DBSource.source, DBBinary.package)


@@ -158,11 +156,11 @@ def print_new (upload, missing, indexed, session, file=sys.stdout):
         if not m['valid']:
             line = line + ' [!]'
         print >>file, line
         if not m['valid']:
             line = line + ' [!]'
         print >>file, line

-    claimed = claimed_overrides(upload, missing, session)
-    if claimed and claimed.count():
-        print '\nCLAIMED OVERRIDES'
-        for c in claimed:
-            print '%s: %s' % (c.source, c.package)
+    takenover = takenover_binaries(upload, missing, session)
+    if takenover and takenover.count():
+        print '\nBINARIES TAKEN OVER'
+        for t in takenover:
+            print '%s: %s' % (t.source, t.package)

     notes = get_new_comments(upload.policy_queue, upload.changes.source)
     for note in notes:
         print "\nAuthor: %s\nVersion: %s\nTimestamp: %s\n\n%s" \
     notes = get_new_comments(upload.policy_queue, upload.changes.source)
     for note in notes:
         print "\nAuthor: %s\nVersion: %s\nTimestamp: %s\n\n%s" \