X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;ds=sidebyside;f=dak%2Fshow_deferred.py;h=fac1692724f970fa736412506a901335c52bcbb5;hb=a6e908f0f30d02794e24f66a6d5f4bedc929456a;hp=e9266bcc03f4aa33a60483b9dc24779e5b146323;hpb=81d0c91b0d085b66aa40a9e147698f618b825d62;p=dak.git
diff --git a/dak/show_deferred.py b/dak/show_deferred.py
index e9266bcc..fac16927 100755
--- a/dak/show_deferred.py
+++ b/dak/show_deferred.py
@@ -22,10 +22,15 @@
import sys, os, re, time
import apt_pkg
-import tempfile
-from debian_bundle import deb822
-from daklib import database
-from daklib import queue
+
+try:
+ # starting with squeeze
+ from debian import deb822
+except:
+ # up to lenny
+ from debian_bundle import deb822
+
+from daklib.dbconn import *
from daklib import utils
from daklib.regexes import re_html_escaping, html_escaping
@@ -103,7 +108,6 @@ def table_header():
Closes |
"""
- return res
def table_footer():
return '
non-NEW uploads are available, see the UploadQueue-README for more information.
\n'
@@ -135,13 +139,15 @@ def get_upload_data(changesfn):
uploader = re.sub(r'^\s*(\S.*)\s+<.*>',r'\1',uploader)
if Cnf.has_key("Show-Deferred::LinkPath"):
isnew = 0
- suites = database.get_suites(achanges['source'],src=1)
+ suites = get_suites_source_in(achanges['source'])
if 'unstable' not in suites and 'experimental' not in suites:
isnew = 1
+
for b in achanges['binary'].split():
- suites = database.get_suites(b)
+ suites = get_suites_binary_in(b)
if 'unstable' not in suites and 'experimental' not in suites:
isnew = 1
+
if not isnew:
# we don't link .changes because we don't want other people to
# upload it with the existing signature.
@@ -173,7 +179,7 @@ def list_uploads(filelist):
f = open(fn,"w")
try:
for u in uploads:
- print >> f, "Changes: %s"%u[1]
+ print >> f, "Changes-file: %s"%u[1]
fields = """Location: DEFERRED
Delayed-Until: %s
Delay-Remaining: %s"""%(time.strftime("%Y-%m-%d %H:%M:%S", time.gmtime(time.time()+u[0])),u[2])
@@ -201,7 +207,7 @@ def usage (exit_code=0):
sys.exit(exit_code)
def init():
- global Cnf, Options, Upload, projectB
+ global Cnf, Options
Cnf = utils.get_conf()
Arguments = [('h',"help","Show-Deferred::Options::Help"),
("p","link-path","Show-Deferred::LinkPath","HasArg"),
@@ -218,8 +224,10 @@ def init():
Options = Cnf.SubTree("Show-Deferred::Options")
if Options["help"]:
usage()
- Upload = queue.Upload(Cnf)
- projectB = Upload.projectB
+
+ # Initialise database connection
+ DBConn()
+
return args
def main():