################################################################################
-def check_pkg (upload, upload_copy):
+def check_pkg (upload, upload_copy, session):
+ missing = []
save_stdout = sys.stdout
changes = os.path.join(upload_copy.directory, upload.changes.changesname)
suite_name = upload.target_suite.suite_name
+ handler = PolicyQueueUploadHandler(upload, session)
+ missing = [(m['type'], m["package"]) for m in handler.missing_overrides(hints=missing)]
try:
sys.stdout = os.popen("less -R -", 'w', 0)
print examine_package.display_changes(suite_name, changes)
for binary in upload.binaries:
binary_file = os.path.join(upload_copy.directory, os.path.basename(binary.poolfile.filename))
- print examine_package.check_deb(suite_name, binary_file)
+ examined = examine_package.check_deb(suite_name, binary_file)
+ # We always need to call check_deb to display package relations for every binary,
+ # but we print its output only if new overrides are being added.
+ if ("deb", binary.package) in missing:
+ print examined
print examine_package.output_package_relations()
except IOError as e:
################################################################################
def do_new(upload, upload_copy, handler, session):
- print "NEW\n"
cnf = Config()
run_user_inspect_command(upload, upload_copy)
#if len(byhand) == 0 and len(missing) == 0:
# break
+ if missing:
+ print "NEW\n"
+
answer = "XXX"
if Options["No-Action"] or Options["Automatic"]:
answer = 'S'
print "Hello? Operator! Give me the number for 911!"
print "Dinstall in the locked area, cant process packages, come back later"
elif answer == 'C':
- check_pkg(upload, upload_copy)
+ check_pkg(upload, upload_copy, session)
elif answer == 'E' and not Options["Trainee"]:
missing = edit_overrides (missing, upload, session)
elif answer == 'M' and not Options["Trainee"]:
handler.reject(reason)
done = True
elif answer == 'N':
- edit_note(get_new_comments(upload.changes.source, session=session),
- upload, session, bool(Options["Trainee"]))
+ if edit_note(get_new_comments(upload.changes.source, session=session),
+ upload, session, bool(Options["Trainee"])) == 0:
+ end()
+ sys.exit(0)
elif answer == 'P' and not Options["Trainee"]:
- prod_maintainer(get_new_comments(upload.changes.source, session=session),
- upload)
+ if prod_maintainer(get_new_comments(upload.changes.source, session=session),
+ upload) == 0:
+ end()
+ sys.exit(0)
Logger.log(["NEW PROD", upload.changes.changesname])
elif answer == 'R' and not Options["Trainee"]:
confirm = utils.our_raw_input("Really clear note (y/N)? ").lower()
end()
sys.exit(0)
+ if handler.get_action():
+ print "PENDING %s\n" % handler.get_action()
+
################################################################################
################################################################################
################################################################################
with UploadCopy(upload) as upload_copy:
handler = PolicyQueueUploadHandler(upload, session)
if handler.get_action() is not None:
+ print "PENDING %s\n" % handler.get_action()
return
do_new(upload, upload_copy, handler, session)
WHERE package IN :sources
ORDER BY package, version"""
- r = session.execute(query, params=dict(sources=sources))
+ r = session.execute(query, params=dict(sources=tuple(sources)))
for i in r:
print "%s_%s\n%s\n(%s)\n\n\n" % (i[0], i[1], i[2], i[3])
################################################################################
+def sort_uploads(uploads, session, nobinaries=False):
+ sources = {}
+ sorteduploads = []
+ suitesrc = [s.source for s in session.query(DBSource.source). \
+ filter(DBSource.suites.any(Suite.suite_name.in_(['unstable', 'experimental'])))]
+ comments = [p.package for p in session.query(NewComment.package). \
+ filter_by(trainee=False).distinct()]
+ for upload in uploads:
+ source = upload.changes.source
+ if not source in sources:
+ sources[source] = []
+ sources[source].append({'upload': upload,
+ 'date': upload.changes.created,
+ 'stack': 1,
+ 'binary': True if source in suitesrc else False,
+ 'comments': True if source in comments else False})
+ for src in sources:
+ if len(sources[src]) > 1:
+ changes = sources[src]
+ firstseen = sorted(changes, key=lambda k: (k['date']))[0]['date']
+ changes.sort(key=lambda item:item['date'])
+ for i in range (0, len(changes)):
+ changes[i]['date'] = firstseen
+ changes[i]['stack'] = i + 1
+ sorteduploads += sources[src]
+ if nobinaries:
+ sorteduploads = [u["upload"] for u in sorted(sorteduploads,
+ key=lambda k: (k["comments"], k["binary"],
+ k["date"], -k["stack"]))]
+ else:
+ sorteduploads = [u["upload"] for u in sorted(sorteduploads,
+ key=lambda k: (k["comments"], -k["binary"],
+ k["date"], -k["stack"]))]
+ return sorteduploads
+
+################################################################################
+
def end():
accept_count = SummaryStats().accept_count
accept_bytes = SummaryStats().accept_bytes
if len(uploads) > 1:
sys.stderr.write("Sorting changes...\n")
- uploads.sort()
+ uploads = sort_uploads(uploads, session, Options["No-Binaries"])
if Options["Comments"]:
show_new_comments(uploads, session)
projects / dak.git / blobdiff