X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fshow_new.py;h=a18847cc96d0f76bdc88bdad8cfc2d0f0eacb6ff;hb=059b274225437414d435c9c9b3bb56a3d002ae28;hp=445f6d2a54888521abf67b706fa61be20d0af6b4;hpb=c60719bc9a46557970c0c43e90d6f7d0469230b0;p=dak.git
diff --git a/dak/show_new.py b/dak/show_new.py
index 445f6d2a..a18847cc 100755
--- a/dak/show_new.py
+++ b/dak/show_new.py
@@ -29,7 +29,7 @@ import copy, os, sys, time
import apt_pkg
import examine_package
import daklib.database
-import daklib.queue
+import daklib.queue as queue
import daklib.utils
# Globals
@@ -53,7 +53,7 @@ def html_header(name, filestoexamine):
%(name)s - Debian NEW package overview
-
+
-
+
"
-
+
def html_footer():
print """ Timestamp: %s (UTC)
"""% (time.strftime("%d.%m.%Y / %H:%M:%S", time.gmtime()))
print """
@@ -146,7 +149,7 @@ def do_pkg(changes_file):
changes["suite"] = copy.copy(changes["distribution"])
# Find out what's new
- new = daklib.queue.determine_new(changes, files, projectB, 0)
+ new = queue.determine_new(changes, files, projectB, 0)
stdout_fd = sys.stdout
@@ -165,14 +168,13 @@ def do_pkg(changes_file):
html_header(changes["source"], filestoexamine)
- daklib.queue.check_valid(new)
+ queue.check_valid(new)
examine_package.display_changes(Upload.pkg.changes_file)
- for fn in filestoexamine:
- if fn.endswith(".deb") or fn.endswith(".udeb"):
- examine_package.check_deb(fn)
- elif fn.endswith(".dsc"):
- examine_package.check_dsc(fn)
+ for fn in filter(lambda fn: fn.endswith(".dsc"), filestoexamine):
+ examine_package.check_dsc(fn)
+ for fn in filter(lambda fn: fn.endswith(".deb") or fn.endswith(".udeb"), filestoexamine):
+ examine_package.check_deb(fn)
html_footer()
if sys.stdout != stdout_fd:
@@ -208,7 +210,7 @@ def init():
if Options["help"]:
usage()
- Upload = daklib.queue.Upload(Cnf)
+ Upload = queue.Upload(Cnf)
projectB = Upload.projectB
@@ -231,8 +233,8 @@ def main():
do_pkg (changes_file)
files = set(os.listdir(Cnf["Show-New::HTMLPath"]))
to_delete = filter(lambda x: x.endswith(".html"), files.difference(sources))
- for file in to_delete:
- os.remove(os.path.join(Cnf["Show-New::HTMLPath"],file))
+ for f in to_delete:
+ os.remove(os.path.join(Cnf["Show-New::HTMLPath"],f))
################################################################################