#!/usr/bin/env python
-# Output html for packages in NEW
+""" Output html for packages in NEW """
# Copyright (C) 2007 Joerg Jaspert <joerg@debian.org>
# This program is free software; you can redistribute it and/or modify
################################################################################
-import copy, os, sys, time
+from copy import copy
+import os, sys, time
import apt_pkg
import examine_package
-import daklib.database
-import daklib.queue as queue
-import daklib.utils
+
+from daklib.queue import determine_new, check_valid, Upload
+from daklib import utils
+from daklib.regexes import re_source_ext
# Globals
Cnf = None
Options = None
-Upload = None
-projectB = None
sources = set()
def do_pkg(changes_file):
- Upload.pkg.changes_file = changes_file
- Upload.init_vars()
- Upload.update_vars()
- files = Upload.pkg.files
- changes = Upload.pkg.changes
-
- changes["suite"] = copy.copy(changes["distribution"])
+ upload = Upload()
+ upload.load_changes(changes_file)
+ files = upload.pkg.files
+ changes = upload.pkg.changes
+ upload.pkg.changes["suite"] = copy(upload.pkg.changes["distribution"])
+ distribution = upload.pkg.changes["distribution"].keys()[0]
# Find out what's new
- new = queue.determine_new(changes, files, projectB, 0)
+ new = determine_new(upload.pkg.changes, upload.pkg.files, 0)
stdout_fd = sys.stdout
filestoexamine = []
for pkg in new.keys():
for fn in new[pkg]["files"]:
- if ( files[fn].has_key("new") and not
- files[fn]["type"] in [ "orig.tar.gz", "orig.tar.bz2", "tar.gz", "tar.bz2", "diff.gz", "diff.bz2"] ):
+ 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)
- queue.check_valid(new)
- examine_package.display_changes(Upload.pkg.changes_file)
+ check_valid(new)
+ examine_package.display_changes( distribution, changes_file)
for fn in filter(lambda fn: fn.endswith(".dsc"), filestoexamine):
- examine_package.check_dsc(fn)
+ examine_package.check_dsc(distribution, fn)
for fn in filter(lambda fn: fn.endswith(".deb") or fn.endswith(".udeb"), filestoexamine):
- examine_package.check_deb(fn)
+ examine_package.check_deb(distribution, fn)
html_footer()
if sys.stdout != stdout_fd:
################################################################################
def init():
- global Cnf, Options, Upload, projectB
+ global Cnf, Options
- Cnf = daklib.utils.get_conf()
+ Cnf = utils.get_conf()
Arguments = [('h',"help","Show-New::Options::Help"),
("p","html-path","Show-New::HTMLPath","HasArg")]
if Options["help"]:
usage()
- Upload = queue.Upload(Cnf)
-
- projectB = Upload.projectB
-
return changes_files
examine_package.use_html=1
for changes_file in changes_files:
- changes_file = daklib.utils.validate_changes_file_arg(changes_file, 0)
+ changes_file = utils.validate_changes_file_arg(changes_file, 0)
if not changes_file:
continue
print "\n" + changes_file