X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fprocess_new.py;h=84170e4bc8373d19b802b72b878afbdb93485388;hb=87ec06f63327126b9200bf5f00fb4e29a481b13c;hp=e3dc5de13e735a35b479335a60841cf18256db97;hpb=dfcf4071605b938bc472062973545e0abe392bfc;p=dak.git diff --git a/dak/process_new.py b/dak/process_new.py index e3dc5de1..84170e4b 100755 --- a/dak/process_new.py +++ b/dak/process_new.py @@ -118,6 +118,25 @@ class Priority_Completer: ################################################################################ +def claimed_overrides(upload, missing, session): + binaries = set([x.package for x in upload.binaries]) + suites = ('unstable','experimental') + for m in missing: + if m['type'] != 'dsc': + binaries.remove(m['package']) + if binaries: + return session.query(DBBinary.package, DBSource.source).distinct(). \ + filter(DBBinary.package.in_(binaries)). \ + join(DBBinary.source). \ + filter(DBSource.source != upload.source.source). \ + join(DBBinary.suites). \ + filter(Suite.suite_name.in_(suites)). \ + order_by(DBSource.source, DBBinary.package) + else: + return None + +################################################################################ + def print_new (upload, missing, indexed, session, file=sys.stdout): check_valid(missing, session) index = 0 @@ -137,6 +156,11 @@ def print_new (upload, missing, indexed, session, file=sys.stdout): 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) notes = get_new_comments(upload.policy_queue, upload.changes.source) for note in notes: print "\nAuthor: %s\nVersion: %s\nTimestamp: %s\n\n%s" \