X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fshow_new.py;h=f64027131d3430173c5b2425038340f93eb95266;hb=969f96350310474d777d4aa804e38ed96a41bd77;hp=895defadb8f71519cd9fa0a152f8b9cf65b25a22;hpb=f56058049885c86071f354d70d69959de8a4cd53;p=dak.git
diff --git a/dak/show_new.py b/dak/show_new.py
old mode 100755
new mode 100644
index 895defad..f6402713
--- a/dak/show_new.py
+++ b/dak/show_new.py
@@ -25,11 +25,11 @@
################################################################################
-import copy, errno, os, stat, sys, time
-import apt_pkg, apt_inst
+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
@@ -51,42 +51,42 @@ def html_header(name):
-
+
+
+
+
+
![](http://www.debian.org/logos/openlogo-nd-50.png)
-
+
![Debian Project](http://www.debian.org/Pics/debian.png)
-
-
-
-
-
+
+
+
+
+
![](http://www.debian.org/Pics/red-upperleft.png) | """
print """Debian NEW package overview for %s | """ % (name)
print """
![](http://www.debian.org/Pics/red-upperright.png) |
-
-
-
+ |
+
+
![](http://www.debian.org/Pics/red-lowerleft.png) |
-
+ |
![](http://www.debian.org/Pics/red-lowerright.png) |
-
-
- """
+ |
+
+ """
def html_footer():
print "
Timestamp: %s (UTC)
" % (time.strftime("%d.%m.%Y / %H:%M:%S", time.gmtime()))
print """
![Valid HTML 4.01!](http://www.w3.org/Icons/valid-html401)
-
+
![Valid CSS!](http://jigsaw.w3.org/css-validator/images/vcss)
"""
@@ -106,7 +106,7 @@ def do_pkg(changes_file):
changes["suite"] = copy.copy(changes["distribution"])
# Find out what's new
- new = daklib.utils.determine_new(changes, files, projectB, 0)
+ new = queue.determine_new(changes, files, projectB, 0)
stdout_fd = sys.stdout
@@ -117,17 +117,17 @@ def do_pkg(changes_file):
sys.stdout = open(os.path.join(Cnf["Show-New::HTMLPath"],htmlname),"w")
html_header(changes["source"])
- daklib.utils.check_valid(new)
+ queue.check_valid(new)
examine_package.display_changes(Upload.pkg.changes_file)
for pkg in new.keys():
- for file in new[pkg]["files"]:
- if ( files[file].has_key("new") and not
- files[file]["type"] in [ "orig.tar.gz", "orig.tar.bz2", "tar.gz", "tar.bz2", "diff.gz", "diff.bz2"] ):
- if file.endswith(".deb") or file.endswith(".udeb"):
- examine_package.check_deb(file)
- elif file.endswith(".dsc"):
- examine_package.check_dsc(file)
+ for f in new[pkg]["files"]:
+ if ( files[f].has_key("new") and not
+ files[f]["type"] in [ "orig.tar.gz", "orig.tar.bz2", "tar.gz", "tar.bz2", "diff.gz", "diff.bz2"] ):
+ if f.endswith(".deb") or f.endswith(".udeb"):
+ examine_package.check_deb(f)
+ elif f.endswith(".dsc"):
+ examine_package.check_dsc(f)
html_footer()
if sys.stdout != stdout_fd:
@@ -161,7 +161,7 @@ def init():
if Options["help"]:
usage()
- Upload = daklib.queue.Upload(Cnf)
+ Upload = queue.Upload(Cnf)
projectB = Upload.projectB
@@ -184,8 +184,8 @@ def main():
do_pkg (changes_file)
files = set(os.listdir(Cnf["Show-New::HTMLPath"]))
to_delete = 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))
################################################################################