X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fshow_new.py;h=4b485f2669ad7e0a642ff2d3712809f5a7b4b79f;hb=f8996e240d9d0278bce098e23be63db0bcc6fbee;hp=a35f4d65d4efa88b1c5d83fade12468293ef105e;hpb=281403d6d387e3adad068ece921af17f507d0f0c;p=dak.git
diff --git a/dak/show_new.py b/dak/show_new.py
index a35f4d65..4b485f26 100755
--- a/dak/show_new.py
+++ b/dak/show_new.py
@@ -28,9 +28,9 @@
import copy, os, sys, time
import apt_pkg
import examine_package
-import daklib.database
-import daklib.queue
-import daklib.utils
+from daklib import database
+from daklib import queue
+from daklib import utils
# Globals
Cnf = None
@@ -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 """
@@ -150,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
@@ -169,7 +168,7 @@ 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 filter(lambda fn: fn.endswith(".dsc"), filestoexamine):
@@ -196,7 +195,7 @@ def usage (exit_code=0):
def init():
global Cnf, Options, Upload, projectB
- Cnf = daklib.utils.get_conf()
+ Cnf = utils.get_conf()
Arguments = [('h',"help","Show-New::Options::Help"),
("p","html-path","Show-New::HTMLPath","HasArg")]
@@ -211,7 +210,7 @@ def init():
if Options["help"]:
usage()
- Upload = daklib.queue.Upload(Cnf)
+ Upload = queue.Upload(Cnf)
projectB = Upload.projectB
@@ -227,15 +226,15 @@ def main():
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
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))
################################################################################
source lintian
"""
for fn in filter(lambda x: x.endswith('.deb') or x.endswith('.udeb'),filestoexamine):
- packagename = fn.split('_')[0]
- print """
-