+ result = """ Timestamp: %s (UTC)
+"""% (time.strftime("%d.%m.%Y / %H:%M:%S", time.gmtime()))
+ result += """
@@ -139,63 +147,64 @@ def html_footer():
"""
-#"""
+ return result
+
################################################################################
-def do_pkg(changes_file, session):
- u = Upload()
- u.pkg.changes_file = changes_file
- (u.pkg.changes["fingerprint"], rejects) = utils.check_signature(changes_file)
- u.load_changes(changes_file)
- new_queue = get_policy_queue('new', session );
- u.pkg.directory = new_queue.path
- u.update_subst()
- origchanges = os.path.abspath(u.pkg.changes_file)
- files = u.pkg.files
- changes = u.pkg.changes
-
- for deb_filename, f in files.items():
- if deb_filename.endswith(".udeb") or deb_filename.endswith(".deb"):
- u.binary_file_checks(deb_filename, session)
- u.check_binary_against_db(deb_filename, session)
- else:
- u.source_file_checks(deb_filename, session)
- u.check_source_against_db(deb_filename, session)
- u.pkg.changes["suite"] = u.pkg.changes["distribution"]
-
- new = determine_new(u.pkg.changes, files, 0)
-
- stdout_fd = sys.stdout
-
- htmlname = changes["source"] + "_" + changes["version"] + ".html"
- sources.add(htmlname)
- # do not generate html output if that source/version already has one.
- if not os.path.exists(os.path.join(cnf["Show-New::HTMLPath"],htmlname)):
- sys.stdout = open(os.path.join(cnf["Show-New::HTMLPath"],htmlname),"w")
-
- filestoexamine = []
- for pkg in new.keys():
- for fn in new[pkg]["files"]:
- if (files[fn].has_key("new") and
- (files[fn]["type"] == "dsc" or
- not re_source_ext.match(files[fn]["type"]))):
- filestoexamine.append(fn)
-
- html_header(changes["source"], filestoexamine)
-
- check_valid(new)
- examine_package.display_changes( u.pkg.changes["distribution"], changes_file)
-
- for fn in filter(lambda fn: fn.endswith(".dsc"), filestoexamine):
- examine_package.check_dsc(distribution, fn)
- for fn in filter(lambda fn: fn.endswith(".deb") or fn.endswith(".udeb"), filestoexamine):
- examine_package.check_deb(distribution, fn)
-
- html_footer()
- if sys.stdout != stdout_fd:
- sys.stdout.close()
- sys.stdout = stdout_fd
+def do_pkg(upload_id):
+ cnf = Config()
+
+ session = DBConn().session()
+ upload = session.query(PolicyQueueUpload).filter_by(id=upload_id).one()
+
+ queue = upload.policy_queue
+ changes = upload.changes
+
+ origchanges = os.path.join(queue.path, changes.changesname)
+ print origchanges
+
+ htmlname = "{0}_{1}.html".format(changes.source, changes.version)
+ htmlfile = os.path.join(cnf['Show-New::HTMLPath'], htmlname)
+
+ # Have we already processed this?
+ if os.path.exists(htmlfile) and \
+ os.stat(htmlfile).st_mtime > time.mktime(changes.created.timetuple()):
+ with open(htmlfile, "r") as fd:
+ if fd.read() != timeout_str:
+ sources.append(htmlname)
+ return (PROC_STATUS_SUCCESS,
+ '%s already up-to-date' % htmlfile)
+
+ # Go, process it... Now!
+ htmlfiles_to_process.append(htmlfile)
+ sources.append(htmlname)
+
+ group = cnf.get('Dinstall::UnprivGroup') or None
+
+ with open(htmlfile, 'w') as outfile:
+ with policy.UploadCopy(upload, group=group) as upload_copy:
+ handler = policy.PolicyQueueUploadHandler(upload, session)
+ missing = [ (o['type'], o['package']) for o in handler.missing_overrides() ]
+ distribution = changes.distribution
+
+ print >>outfile, html_header(changes.source, missing)
+ print >>outfile, examine_package.display_changes(distribution, origchanges)
+
+ if upload.source is not None and ('dsc', upload.source.source) in missing:
+ fn = os.path.join(upload_copy.directory, upload.source.poolfile.basename)
+ print >>outfile, examine_package.check_dsc(distribution, fn, session)
+ for binary in upload.binaries:
+ if (binary.binarytype, binary.package) not in missing:
+ continue
+ fn = os.path.join(upload_copy.directory, binary.poolfile.basename)
+ print >>outfile, examine_package.check_deb(distribution, fn, session)
+
+ print >>outfile, html_footer()
+
+ session.close()
+ htmlfiles_to_process.remove(htmlfile)
+ return (PROC_STATUS_SUCCESS, '{0} already updated'.format(htmlfile))
################################################################################
@@ -214,43 +223,53 @@ def init(session):
cnf = Config()
Arguments = [('h',"help","Show-New::Options::Help"),
- ("p","html-path","Show-New::HTMLPath","HasArg")]
+ ("p","html-path","Show-New::HTMLPath","HasArg"),
+ ('q','queue','Show-New::Options::Queue','HasArg')]
for i in ["help"]:
if not cnf.has_key("Show-New::Options::%s" % (i)):
cnf["Show-New::Options::%s" % (i)] = ""
- changes_files = apt_pkg.ParseCommandLine(cnf.Cnf,Arguments,sys.argv)
- if len(changes_files) == 0:
- new_queue = get_policy_queue('new', session );
- changes_files = utils.get_changes_files(new_queue.path)
-
- Options = cnf.SubTree("Show-New::Options")
+ changesnames = apt_pkg.parse_commandline(cnf.Cnf,Arguments,sys.argv)
+ Options = cnf.subtree("Show-New::Options")
if Options["help"]:
usage()
- return changes_files
+ queue_names = Options.find('Queue', 'new').split(',')
+ uploads = session.query(PolicyQueueUpload) \
+ .join(PolicyQueueUpload.policy_queue).filter(PolicyQueue.queue_name.in_(queue_names)) \
+ .join(PolicyQueueUpload.changes).order_by(DBChange.source)
+
+ if len(changesnames) > 0:
+ uploads = uploads.filter(DBChange.changesname.in_(changesnames))
+
+ return uploads
################################################################################
################################################################################
def main():
+ examine_package.use_html = True
+ pool = DakProcessPool(processes=5)
+
session = DBConn().session()
- changes_files = init(session)
+ upload_ids = [ u.id for u in init(session) ]
+ session.close()
- examine_package.use_html=1
+ for upload_id in upload_ids:
+ pool.apply_async(do_pkg, [upload_id])
+ pool.close()
- for changes_file in changes_files:
- changes_file = utils.validate_changes_file_arg(changes_file, 0)
- if not changes_file:
- continue
- print "\n" + changes_file
- do_pkg (changes_file, session)
+ #p.wait(timeout=600)
+ pool.join()
+ for htmlfile in htmlfiles_to_process:
+ with open(htmlfile, "w") as fd:
+ fd.write(timeout_str)
files = set(os.listdir(cnf["Show-New::HTMLPath"]))
- to_delete = filter(lambda x: x.endswith(".html"), files.difference(sources))
+ to_delete = filter(lambda x: x.endswith(".html"), files.difference(set(sources)))
for f in to_delete:
os.remove(os.path.join(cnf["Show-New::HTMLPath"],f))