__all__.append('sg_compare')
-def sort_changes(changes_files, session):
+def sort_changes(changes_files, session, binaries = None):
"""Sort into source groups, then sort each source group by version,
have source, filename. Finally, sort the source groups by have
note, time of oldest upload of each source upload."""
# Determine oldest time and have note status for each source group
for source in per_source.keys():
q = session.query(DBSource).filter_by(source = source).all()
- per_source[source]["source_in_database"] = len(q)>0
+ per_source[source]["source_in_database"] = binaries and -(len(q)>0) or len(q)>0
source_list = per_source[source]["list"]
first = source_list[0]
oldest = os.stat(first["filename"])[stat.ST_MTIME]
cnf = Config()
(summary, short_summary) = upload.build_summaries()
+ destqueue = get_policy_queue('newstage', session)
- # XXX: mhy: I think this is wrong as these are all attributes on the
- # build and policy queues now
- if cnf.FindB("Dinstall::SecurityQueueHandling"):
- upload.dump_vars(cnf["Dir::Queue::Embargoed"])
- upload.move_to_queue(get_policy_queue('embargoed'))
- upload.queue_build("embargoed", cnf["Dir::Queue::Embargoed"])
- # Check for override disparities
- upload.Subst["__SUMMARY__"] = summary
- else:
- # Just a normal upload, accept it...
- (summary, short_summary) = upload.build_summaries()
- destqueue = get_policy_queue('newstage', session)
-
- srcqueue = get_policy_queue_from_path(upload.pkg.directory, session)
+ srcqueue = get_policy_queue_from_path(upload.pkg.directory, session)
- if not srcqueue:
- # Assume NEW and hope for the best
- srcqueue = get_policy_queue('new', session)
+ if not srcqueue:
+ # Assume NEW and hope for the best
+ srcqueue = get_policy_queue('new', session)
- changes_to_queue(upload, srcqueue, destqueue, session)
+ changes_to_queue(upload, srcqueue, destqueue, session)
__all__.append('new_accept')