from daklib.config import Config
from daklib import daklog
from daklib.changesutils import *
+from daklib.dakmultiprocessing import DakProcessPool
# Globals
Cnf = None
def html_header(name, filestoexamine):
if name.endswith('.changes'):
name = ' '.join(name.split('_')[:2])
- print """<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+ result = """<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="de" lang="de">
<head>
<meta http-equiv="content-type" content="text/xhtml+xml; charset=utf-8"
Debian NEW package overview for %(name)s
</span>
</div>
+
"""%{"name":name}
# we assume only one source (.dsc) per changes here
- print """
+ result += """
<div id="menu">
<p class="title">Navigation</p>
<p><a href="#changes" onclick="show('changes-body')">.changes</a></p>
<p><a href="#dsc" onclick="show('dsc-body')">.dsc</a></p>
<p><a href="#source-lintian" onclick="show('source-lintian-body')">source lintian</a></p>
- """
+
+"""
for fn in filter(lambda x: x.endswith('.deb') or x.endswith('.udeb'),filestoexamine):
packagename = fn.split('_')[0]
- print """
+ result += """
<p class="subtitle">%(pkg)s</p>
<p><a href="#binary-%(pkg)s-control" onclick="show('binary-%(pkg)s-control-body')">control file</a></p>
<p><a href="#binary-%(pkg)s-lintian" onclick="show('binary-%(pkg)s-lintian-body')">binary lintian</a></p>
<p><a href="#binary-%(pkg)s-contents" onclick="show('binary-%(pkg)s-contents-body')">.deb contents</a></p>
<p><a href="#binary-%(pkg)s-copyright" onclick="show('binary-%(pkg)s-copyright-body')">copyright</a></p>
<p><a href="#binary-%(pkg)s-file-listing" onclick="show('binary-%(pkg)s-file-listing-body')">file listing</a></p>
- """%{"pkg":packagename}
- print " </div>"
+
+"""%{"pkg":packagename}
+ result += " </div>"
+ return result
def html_footer():
- print """ <p class="validate">Timestamp: %s (UTC)</p>"""% (time.strftime("%d.%m.%Y / %H:%M:%S", time.gmtime()))
- print """ <p><a href="http://validator.w3.org/check?uri=referer">
+ result = """ <p class="validate">Timestamp: %s (UTC)</p>
+"""% (time.strftime("%d.%m.%Y / %H:%M:%S", time.gmtime()))
+ result += """ <p><a href="http://validator.w3.org/check?uri=referer">
<img src="http://www.w3.org/Icons/valid-html401" alt="Valid HTML 4.01!"
style="border: none; height: 31px; width: 88px" /></a>
<a href="http://jigsaw.w3.org/css-validator/check/referer">
</body>
</html>
"""
-#"""
+ return result
+
################################################################################
-def do_pkg(changes_file, session):
+def do_pkg(changes_file):
+ session = DBConn().session()
u = Upload()
u.pkg.changes_file = changes_file
- (u.pkg.changes["fingerprint"], rejects) = utils.check_signature(changes_file)
+ # We can afoord not to check the signature before loading the changes file
+ # as we've validated it already (otherwise it couldn't be in new)
+ # and we can more quickly skip over already processed files this way
u.load_changes(changes_file)
+
+ origchanges = os.path.abspath(u.pkg.changes_file)
+
+ # Still be cautious in case paring the changes file went badly
+ if u.pkg.changes.has_key('source') and u.pkg.changes.has_key('version'):
+ htmlname = u.pkg.changes["source"] + "_" + u.pkg.changes["version"] + ".html"
+ htmlfile = os.path.join(cnf["Show-New::HTMLPath"], htmlname)
+ else:
+ # Changes file was bad
+ print "Changes file %s missing source or version field" % changes_file
+ session.close()
+ return
+
+ # Have we already processed this?
+ if os.path.exists(htmlfile) and \
+ os.stat(htmlfile).st_mtime > os.stat(origchanges).st_mtime:
+ sources.add(htmlname)
+ session.close()
+ return (PROC_STATUS_SUCCESS, '%s already up-to-date' % htmlfile)
+
+ # Now we'll load the fingerprint
+ (u.pkg.changes["fingerprint"], rejects) = utils.check_signature(changes_file, session=session)
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
+ sources.add(htmlname)
for deb_filename, f in files.items():
if deb_filename.endswith(".udeb") or deb_filename.endswith(".deb"):
u.check_source_against_db(deb_filename, session)
u.pkg.changes["suite"] = u.pkg.changes["distribution"]
- new = determine_new(u.pkg.changes, files, 0)
+ new, byhand = determine_new(u.pkg.changes_file, u.pkg.changes, files, 0, dsc=u.pkg.dsc, session=session)
- stdout_fd = sys.stdout
+ outfile = open(os.path.join(cnf["Show-New::HTMLPath"],htmlname),"w")
- 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"]:
+ filestoexamine.append(fn)
+
+ print >> outfile, html_header(changes["source"], filestoexamine)
- filestoexamine = []
- for pkg in new.keys():
- for fn in new[pkg]["files"]:
- filestoexamine.append(fn)
+ check_valid(new, session)
+ distribution = changes["distribution"].keys()[0]
+ print >> outfile, examine_package.display_changes(distribution, changes_file)
- html_header(changes["source"], filestoexamine)
+ for fn in filter(lambda fn: fn.endswith(".dsc"), filestoexamine):
+ print >> outfile, examine_package.check_dsc(distribution, fn, session)
+ for fn in filter(lambda fn: fn.endswith(".deb") or fn.endswith(".udeb"), filestoexamine):
+ print >> outfile, examine_package.check_deb(distribution, fn, session)
- check_valid(new)
- distribution = changes["distribution"].keys()[0]
- examine_package.display_changes(distribution, changes_file)
+ print >> outfile, html_footer()
- 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)
+ outfile.close()
+ session.close()
- html_footer()
- if sys.stdout != stdout_fd:
- sys.stdout.close()
- sys.stdout = stdout_fd
+ return (PROC_STATUS_SUCCESS, '%s already updated' % htmlfile)
################################################################################
examine_package.use_html=1
+ pool = DakProcessPool()
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)
+ pool.apply_async(do_pkg, (changes_file,))
+ do_pkg(changes_file)
+ pool.close()
+ pool.join()
files = set(os.listdir(cnf["Show-New::HTMLPath"]))
to_delete = filter(lambda x: x.endswith(".html"), files.difference(sources))
projects / dak.git / blobdiff