Nabble - debian-dak

[dak/master] EVIL SINGLE TAB CHARACTER IN LAST COMMIT EMERGENCY FIX

2008-10-14T12:36:57Z

Signed-off-by: Thomas Viehmann <tv@...>
---
ChangeLog | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7a74b95..e57705e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
2008-10-14 Thomas Viehmann <tv@...>

* dak/show_deferred.py: produce .changes and improve status
-
+
2008-10-07 Joerg Jaspert <joerg@...>

* config/debian/cron.dinstall: Only keep the last 60 days of
--
1.5.6.5

--
To UNSUBSCRIBE, email to debian-dak-request@...
with a subject of "unsubscribe". Trouble? Contact listmaster@...

[dak/master] changelog

2008-10-14T12:31:34Z

Signed-off-by: Thomas Viehmann <tv@...>
---
ChangeLog | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b303443..7a74b95 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-10-14 Thomas Viehmann <tv@...>
+
+ * dak/show_deferred.py: produce .changes and improve status
+
2008-10-07 Joerg Jaspert <joerg@...>

* config/debian/cron.dinstall: Only keep the last 60 days of
--
1.5.6.5

--
To UNSUBSCRIBE, email to debian-dak-request@...
with a subject of "unsubscribe". Trouble? Contact listmaster@...

[dak/master] bug #

2008-10-14T12:30:17Z

---
dak/show_deferred.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/dak/show_deferred.py b/dak/show_deferred.py
index bc2c254..bb29fdd 100755
--- a/dak/show_deferred.py
+++ b/dak/show_deferred.py
@@ -29,7 +29,7 @@ from daklib import queue
from daklib import utils

################################################################################
-### work around bug in debian-python 0.1.10
+### work around bug #487902 in debian-python 0.1.10
deb822.Changes._multivalued_fields = {
"files": [ "md5sum", "size", "section", "priority", "name" ],
"checksums-sha1": ["sha1", "size", "name"],
--
1.5.6.5

--
To UNSUBSCRIBE, email to debian-dak-request@...
with a subject of "unsubscribe". Trouble? Contact listmaster@...

[dak/master] produce changes without signature, fix delay calculation also for status

2008-10-14T08:21:26Z

Signed-off-by: Thomas Viehmann <tv@...>
---
dak/show_deferred.py | 28 ++++++++++++++++++----------
1 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/dak/show_deferred.py b/dak/show_deferred.py
index 4ffa5e6..bc2c254 100755
--- a/dak/show_deferred.py
+++ b/dak/show_deferred.py
@@ -29,6 +29,14 @@ from daklib import queue
from daklib import utils

################################################################################
+### work around bug in debian-python 0.1.10
+deb822.Changes._multivalued_fields = {
+ "files": [ "md5sum", "size", "section", "priority", "name" ],
+ "checksums-sha1": ["sha1", "size", "name"],
+ "checksums-sha256": ["sha256", "size", "name"],
+ }
+
+################################################################################

row_number = 1

@@ -146,7 +154,7 @@ def get_upload_data(changesfn):
if os.path.exists(qfn):
os.symlink(qfn,lfn)
os.chmod(qfn, 0644)
- return (delaydays*24*60*60+remainingtime, changesname, delay, uploader, achanges.get('closes').split(),achanges)
+ return (max(delaydays-1,0)*24*60*60+remainingtime, changesname, delay, uploader, achanges.get('closes').split(),achanges)

def list_uploads(filelist):
uploads = map(get_upload_data, filelist)
@@ -166,13 +174,13 @@ def list_uploads(filelist):
f = open(fn,"w")
try:
for u in uploads:
- print >> f, """Changes: %s
-Location: DEFERRED
+ print >> f, "Changes: %s"%u[1]
+ fields = """Location: DEFERRED
Delayed-Until: %s
-Delay-Remaining: %s"""%(u[1],time.strftime("%Y-%m-%d %H:%M:%S", time.gmtime(time.time()+u[0])),u[2])
- for k,v in u[5].items():
- if not k.startswith('Checksums-') and k != 'Files':
- print >> f, "%s: %s"%(k,v)
+Delay-Remaining: %s"""%(time.strftime("%Y-%m-%d %H:%M:%S", time.gmtime(time.time()+u[0])),u[2])
+ print >> f, fields
+ print >> f, str(u[5]).rstrip()
+ open(os.path.join(Cnf["Show-Deferred::LinkPath"],u[1]),"w").write(str(u[5])+fields+'\n')
print >> f
f.close()
os.rename(os.path.join(Cnf["Show-Deferred::LinkPath"],'.status.tmp'),
@@ -231,7 +239,7 @@ def main():
# remove dead links
for r,d,f in os.walk(Cnf["Show-Deferred::LinkPath"]):
for af in f:
- af = os.path.join(r,af)
- if (not os.path.exists(af) or
+ afp = os.path.join(r,af)
+ if (not os.path.exists(afp) or
(af.endswith('.changes') and af not in available_changes)):
- os.unlink(af)
+ os.unlink(afp)
--
1.5.6.5

--
To UNSUBSCRIBE, email to debian-dak-request@...
with a subject of "unsubscribe". Trouble? Contact listmaster@...

srcdep Packages-arch-specific,1.775,1.776

2008-10-14T03:59:55Z

Update of /cvs/dak/srcdep
In directory gluck:/tmp/cvs-serv12246

Modified Files:
Packages-arch-specific
Log Message:
read-edid also works on lpia per cjwatson/smagoun

Index: Packages-arch-specific
===================================================================
RCS file: /cvs/dak/srcdep/Packages-arch-specific,v
retrieving revision 1.775
retrieving revision 1.776
diff -u -d -r1.775 -r1.776
--- Packages-arch-specific 19 Sep 2008 16:21:03 -0000 1.775
+++ Packages-arch-specific 14 Oct 2008 10:59:44 -0000 1.776
@@ -751,7 +751,7 @@
quik-installer: powerpc # powerpc boot loader
qvplay: i386 # Attatches through the parallel port
raidtools: !ia64 !hppa
-%read-edid: i386 powerpc # ioperm()/iopl(), vm86() etc. i386 specific
+%read-edid: i386 powerpc lpia # ioperm()/iopl(), vm86() etc. i386 specific
red-carpet: i386 # brain damaged upstream...
%ree: i386 ia64 amd64 hurd-i386 freebsd-i386 netbsd-i386 # i386 specific
%refit: i386 # EFI bootloader

--
To UNSUBSCRIBE, email to debian-dak-request@...
with a subject of "unsubscribe". Trouble? Contact listmaster@...

[dak/master] add machine-readable status

2008-10-11T01:37:08Z

Signed-off-by: Thomas Viehmann <tv@...>
---
dak/show_deferred.py | 31 +++++++++++++++++++++++++++----
1 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/dak/show_deferred.py b/dak/show_deferred.py
index 6c24c23..4ffa5e6 100755
--- a/dak/show_deferred.py
+++ b/dak/show_deferred.py
@@ -22,6 +22,7 @@

import sys, os, re, time
import apt_pkg
+import tempfile
from debian_bundle import deb822
from daklib import database
from daklib import queue
@@ -145,19 +146,40 @@ def get_upload_data(changesfn):
if os.path.exists(qfn):
os.symlink(qfn,lfn)
os.chmod(qfn, 0644)
- return (delaydays*24*60*60+remainingtime, changesname, delay, uploader, achanges.get('closes').split())
+ return (delaydays*24*60*60+remainingtime, changesname, delay, uploader, achanges.get('closes').split(),achanges)

def list_uploads(filelist):
uploads = map(get_upload_data, filelist)
uploads.sort()
+ # print the summary page
print header()
if uploads:
print table_header()
- print ''.join(map(lambda x: table_row(*x[1:]), uploads))
+ print ''.join(map(lambda x: table_row(*x[1:5]), uploads))
print table_footer()
else:
print '<h1>Currently no deferred uploads to Debian</h1>'
print footer()
+ # machine readable summary
+ if Cnf.has_key("Show-Deferred::LinkPath"):
+ fn = os.path.join(Cnf["Show-Deferred::LinkPath"],'.status.tmp')
+ f = open(fn,"w")
+ try:
+ for u in uploads:
+ print >> f, """Changes: %s
+Location: DEFERRED
+Delayed-Until: %s
+Delay-Remaining: %s"""%(u[1],time.strftime("%Y-%m-%d %H:%M:%S", time.gmtime(time.time()+u[0])),u[2])
+ for k,v in u[5].items():
+ if not k.startswith('Checksums-') and k != 'Files':
+ print >> f, "%s: %s"%(k,v)
+ print >> f
+ f.close()
+ os.rename(os.path.join(Cnf["Show-Deferred::LinkPath"],'.status.tmp'),
+ os.path.join(Cnf["Show-Deferred::LinkPath"],'status'))
+ except:
+ os.unlink(fn)
+ raise

def usage (exit_code=0):
if exit_code:
@@ -204,11 +226,12 @@ def main():
filter(lambda x: x.endswith('.changes'), f))
list_uploads(filelist)

+ available_changes = set(map(os.path.basename,filelist))
if Cnf.has_key("Show-Deferred::LinkPath"):
# remove dead links
for r,d,f in os.walk(Cnf["Show-Deferred::LinkPath"]):
for af in f:
af = os.path.join(r,af)
- if not os.path.exists(af):
- print >> sys.stderr, "obsolete",af
+ if (not os.path.exists(af) or
+ (af.endswith('.changes') and af not in available_changes)):
os.unlink(af)
--
1.5.6.5

--
To UNSUBSCRIBE, email to debian-dak-request@...
with a subject of "unsubscribe". Trouble? Contact listmaster@...

[dak/master] show_deferred

2008-10-11T00:44:36Z

remove debug output

Signed-off-by: Joerg Jaspert <joerg@...>
---
dak/show_deferred.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/dak/show_deferred.py b/dak/show_deferred.py
index 6c24c23..aa33b2e 100755
--- a/dak/show_deferred.py
+++ b/dak/show_deferred.py
@@ -210,5 +210,5 @@ def main():
for af in f:
af = os.path.join(r,af)
if not os.path.exists(af):
- print >> sys.stderr, "obsolete",af
+ #print >> sys.stderr, "obsolete",af
os.unlink(af)
--
1.5.6.5

--
To UNSUBSCRIBE, email to debian-dak-request@...
with a subject of "unsubscribe". Trouble? Contact listmaster@...

[dak/master] config for show-deferred

2008-10-07T13:31:41Z

---
config/debian/cron.hourly | 2 +-
config/debian/dak.conf | 1 +
dak/show_deferred.py | 21 ++++++++++++++-------
3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/config/debian/cron.hourly b/config/debian/cron.hourly
index 57a63b2..ce1d43e 100755
--- a/config/debian/cron.hourly
+++ b/config/debian/cron.hourly
@@ -10,5 +10,5 @@ export SCRIPTVARS=/srv/ftp.debian.org/dak/config/debian/vars
date -u > $ftpdir/project/trace/ftp-master.debian.org
dak import-users-from-passwd
dak queue-report -n > $webdir/new.html
-/srv/queued/debianqueued-0.9/show-deferred /srv/queued/DEFERRED/ > ${webdir}/deferred.html
+dak show-deferred > ${webdir}/deferred.html
cd $queuedir/new ; dak show-new *.changes > /dev/null
diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index 75ea43e..b8e1a48 100644
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -129,6 +129,7 @@ Show-New
Show-Deferred
{
LinkPath "/srv/ftp.debian.org/web/deferred/";
+ DeferredQueue "/srv/queued/DEFERRED/";
}

Import-Users-From-Passwd
diff --git a/dak/show_deferred.py b/dak/show_deferred.py
index e718f74..6c24c23 100755
--- a/dak/show_deferred.py
+++ b/dak/show_deferred.py
@@ -164,9 +164,10 @@ def usage (exit_code=0):
f = sys.stderr
else:
f = sys.stdout
- print >> f, """Usage: dak show-deferred /path/to/DEFERRED
- -h, --help show this help and exit.
- -p, --html-path [path] override output directory.
+ print >> f, """Usage: dak show-deferred
+ -h, --help show this help and exit.
+ -p, --link-path [path] override output directory.
+ -d, --deferred-queue [path] path to the deferred queue
"""
sys.exit(exit_code)

@@ -174,11 +175,17 @@ def init():
global Cnf, Options, Upload, projectB
Cnf = utils.get_conf()
Arguments = [('h',"help","Show-Deferred::Options::Help"),
- ("p","link-path","Show-Deferred::LinkPath","HasArg")]
+ ("p","link-path","Show-Deferred::LinkPath","HasArg"),
+ ("d","deferred-queue","Show-Deferred::DeferredQueue","HasArg")]
+ args = apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv)
for i in ["help"]:
if not Cnf.has_key("Show-Deferred::Options::%s" % (i)):
Cnf["Show-Deferred::Options::%s" % (i)] = ""
- args = apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv)
+ for i,j in [("DeferredQueue","--deferred-queue")]:
+ if not Cnf.has_key("Show-Deferred::%s" % (i)):
+ print >> sys.stderr, """Show-Deferred::%s is mandatory.
+ set via config file or command-line option %s"""%(i,j)
+
Options = Cnf.SubTree("Show-Deferred::Options")
if Options["help"]:
usage()
@@ -188,11 +195,11 @@ def init():

def main():
args = init()
- if len(args)!=1:
+ if len(args)!=0:
usage(1)

filelist = []
- for r,d,f in os.walk(args[0]):
+ for r,d,f in os.walk(Cnf["Show-Deferred::DeferredQueue"]):
filelist += map (lambda x: os.path.join(r,x),
filter(lambda x: x.endswith('.changes'), f))
list_uploads(filelist)
--
1.5.6.5

--
To UNSUBSCRIBE, email to debian-dak-request@...
with a subject of "unsubscribe". Trouble? Contact listmaster@...

[dak/master] whitespace sanitizing

2008-10-07T13:13:27Z

---
dak/show_deferred.py | 6 +++---
daklib/database.py | 1 -
2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/dak/show_deferred.py b/dak/show_deferred.py
index 81c117b..e718f74 100755
--- a/dak/show_deferred.py
+++ b/dak/show_deferred.py
@@ -105,7 +105,7 @@ def table_row(changesname, delay, changed_by, closes):

res = '<tr class="%s">'%((row_number%2) and 'odd' or 'even')
res += (3*'<td valign="top">%s</td>')%tuple(map(html_escape,(changesname,delay,changed_by)))
- res += ('<td valign="top">%s</td>' %
+ res += ('<td valign="top">%s</td>' %
''.join(map(lambda close: '<a href="http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=%s">#%s</a><br>' % (close, close),closes)))
res += '</tr>\n'
row_number+=1
@@ -169,7 +169,7 @@ def usage (exit_code=0):
-p, --html-path [path] override output directory.
"""
sys.exit(exit_code)
-
+
def init():
global Cnf, Options, Upload, projectB
Cnf = utils.get_conf()
@@ -190,7 +190,7 @@ def main():
args = init()
if len(args)!=1:
usage(1)
-
+
filelist = []
for r,d,f in os.walk(args[0]):
filelist += map (lambda x: os.path.join(r,x),
diff --git a/daklib/database.py b/daklib/database.py
index 1d9f3c0..5c7bd83 100755
--- a/daklib/database.py
+++ b/daklib/database.py
@@ -397,4 +397,3 @@ def get_suites(pkgname, src=False):
sql = "select suite_name from binaries, bin_associations,suite where binaries.id=bin_associations.bin and package='%s' and bin_associations.suite = suite.id"%pkgname
q = projectB.query(sql)
return map(lambda x: x[0], q.getresult())
-
--
1.5.6.5

--
To UNSUBSCRIBE, email to debian-dak-request@...
with a subject of "unsubscribe". Trouble? Contact listmaster@...

[dak/master] move config to config

2008-10-07T13:02:38Z

---
config/debian/dak.conf | 5 +++++
dak/show_deferred.py | 6 ++----
2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index 4377530..75ea43e 100644
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -126,6 +126,11 @@ Show-New
HTMLPath "/srv/ftp.debian.org/web/new/";
}

+Show-Deferred
+{
+ LinkPath "/srv/ftp.debian.org/web/deferred/";
+}
+
Import-Users-From-Passwd
{
ValidGID "800";
diff --git a/dak/show_deferred.py b/dak/show_deferred.py
index 6952922..81c117b 100755
--- a/dak/show_deferred.py
+++ b/dak/show_deferred.py
@@ -176,10 +176,8 @@ def init():
Arguments = [('h',"help","Show-Deferred::Options::Help"),
("p","link-path","Show-Deferred::LinkPath","HasArg")]
for i in ["help"]:
- if not Cnf.has_key("Show-Deferred::Options::LinkPath"):
- Cnf["Show-Deferred::Options::LinkPath"] = "/org/ftp.debian.org/web/deferred/"
- if not Cnf.has_key("Show-Deferred::Options::%s" % (i)):
- Cnf["Show-Deferred::Options::%s" % (i)] = ""
+ if not Cnf.has_key("Show-Deferred::Options::%s" % (i)):
+ Cnf["Show-Deferred::Options::%s" % (i)] = ""
args = apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv)
Options = Cnf.SubTree("Show-Deferred::Options")
if Options["help"]:
--
1.5.6.5

--
To UNSUBSCRIBE, email to debian-dak-request@...
with a subject of "unsubscribe". Trouble? Contact listmaster@...

[dak/master] message massage

2008-10-07T12:52:41Z

---
dak/show_deferred.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/dak/show_deferred.py b/dak/show_deferred.py
index 70468b5..6952922 100755
--- a/dak/show_deferred.py
+++ b/dak/show_deferred.py
@@ -98,7 +98,7 @@ def table_header():
return res

def table_footer():
- return '</table><br/><p>non-NEW uploads are <a href="/deferred/">available</a>, use <tt>dcut reschedule foo.changes X-day</tt> to adjust delays.</p></center><br/>\n'
+ return '</table><br/><p>non-NEW uploads are <a href="/deferred/">available</a>, see the <a href="ftp://ftp-master.debian.org/pub/UploadQueue/README">UploadQueue-README</a> for more information.</p></center><br/>\n'

def table_row(changesname, delay, changed_by, closes):
global row_number
--
1.5.6.5

--
To UNSUBSCRIBE, email to debian-dak-request@...
with a subject of "unsubscribe". Trouble? Contact listmaster@...

[dak/master] logfiles

2008-10-07T12:41:33Z

only keep 60 days of cron logfiles on disc

Signed-off-by: Joerg Jaspert <joerg@...>
---
ChangeLog | 5 +++++
config/debian/cron.dinstall | 15 +++++++++++++++
2 files changed, 20 insertions(+), 0 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 288c770..519c6c9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-10-07 Joerg Jaspert <joerg@...>
+
+ * config/debian/cron.dinstall: Only keep the last 60 days of
+ dinstall logfiles on disc.
+
2008-09-23 Joerg Jaspert <joerg@...>

* config/debian/dak.conf: Add the validtime fields, set to 7
diff --git a/config/debian/cron.dinstall b/config/debian/cron.dinstall
index de44fe5..cb326fc 100755
--- a/config/debian/cron.dinstall
+++ b/config/debian/cron.dinstall
@@ -338,6 +338,21 @@ echo "Compress old psql backups"

ts

+echo "Removing old dinstall logfiles"
+(cd $logdir
+ find -maxdepth 1 -mindepth 1 -type f -name 'dinstall_*' -mtime +60 |
+ while read dumpname; do
+ echo "Removing $dumpname"
+ rm -f "$dumpname"
+ done
+
+ find -maxdepth 1 -mindepth 1 -type f -name 'weekly_*' -mtime +60 |
+ while read dumpname; do
+ echo "Removing $dumpname"
+ rm -f "$dumpname"
+ done
+)
+
echo "Finally, all is done, sending mail and compressing logfile"
exec > /dev/null 2>&1

--
1.5.6.5

--
To UNSUBSCRIBE, email to debian-dak-request@...
with a subject of "unsubscribe". Trouble? Contact listmaster@...

[dak/master] move show-deferred to dak

2008-10-07T12:41:26Z

---
ChangeLog | 1 +
dak/dak.py | 2 ++
dak/show_deferred.py | 40 +++++++++++++++++++++-------------------
3 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3e1620d..2ec5c51 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
2008-10-05 Thomas Viehmann <tv@...>

* daklib/database.py: added get_suites
+ * dak/dak.py, dak/show_deferred.py: add show-deferred to dak.

2008-09-23 Joerg Jaspert <joerg@...>

diff --git a/dak/dak.py b/dak/dak.py
index 5a986d5..c987c1e 100755
--- a/dak/dak.py
+++ b/dak/dak.py
@@ -88,6 +88,8 @@ def init():
"Produce a report on NEW and BYHAND packages"),
("show-new",
"Output html for packages in NEW"),
+ ("show-deferred",
+ "Output html and symlinks for packages in DEFERRED"),

("rm",
"Remove packages from suites"),
diff --git a/dak/show_deferred.py b/dak/show_deferred.py
index 6c81179..70468b5 100755
--- a/dak/show_deferred.py
+++ b/dak/show_deferred.py
@@ -142,8 +142,9 @@ def get_upload_data(changesfn):
qfn = os.path.join(os.path.dirname(changesfn),afn)
if os.path.islink(lfn):
os.unlink(lfn)
- os.symlink(qfn,lfn)
- os.chmod(qfn, 0644)
+ if os.path.exists(qfn):
+ os.symlink(qfn,lfn)
+ os.chmod(qfn, 0644)
return (delaydays*24*60*60+remainingtime, changesname, delay, uploader, achanges.get('closes').split())

def list_uploads(filelist):
@@ -187,21 +188,22 @@ def init():
projectB = Upload.projectB
return args

-args = init()
-if len(args)!=1:
- usage(1)
+def main():
+ args = init()
+ if len(args)!=1:
+ usage(1)

-filelist = []
-for r,d,f in os.walk(args[0]):
- filelist += map (lambda x: os.path.join(r,x),
- filter(lambda x: x.endswith('.changes'), f))
-list_uploads(filelist)
-
-if Cnf.has_key("Show-Deferred::LinkPath"):
- # remove dead links
- for r,d,f in os.walk(Cnf["Show-Deferred::LinkPath"]):
- for af in f:
- af = os.path.join(r,af)
- if not os.path.exists(af):
- print >> sys.stderr, "obsolete",af
- os.unlink(af)
+ filelist = []
+ for r,d,f in os.walk(args[0]):
+ filelist += map (lambda x: os.path.join(r,x),
+ filter(lambda x: x.endswith('.changes'), f))
+ list_uploads(filelist)
+
+ if Cnf.has_key("Show-Deferred::LinkPath"):
+ # remove dead links
+ for r,d,f in os.walk(Cnf["Show-Deferred::LinkPath"]):
+ for af in f:
+ af = os.path.join(r,af)
+ if not os.path.exists(af):
+ print >> sys.stderr, "obsolete",af
+ os.unlink(af)
--
1.5.6.5

--
To UNSUBSCRIBE, email to debian-dak-request@...
with a subject of "unsubscribe". Trouble? Contact listmaster@...

[dak/master] move show-deferred to dak

2008-10-07T12:41:18Z

---
dak/show_deferred.py | 207 +++++++++++++++++++++++++++++++++
tools/debianqueued-0.9/show-deferred | 208 ----------------------------------
2 files changed, 207 insertions(+), 208 deletions(-)
create mode 100755 dak/show_deferred.py
delete mode 100755 tools/debianqueued-0.9/show-deferred

diff --git a/dak/show_deferred.py b/dak/show_deferred.py
new file mode 100755
index 0000000..6c81179
--- /dev/null
+++ b/dak/show_deferred.py
@@ -0,0 +1,207 @@
+#!/usr/bin/env python
+
+# based on queue-report
+# Copyright (C) 2001, 2002, 2003, 2005, 2006 James Troup <james@...>
+# Copyright (C) 2008 Thomas Viehmann <tv@...>
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+################################################################################
+
+import sys, os, re, time
+import apt_pkg
+from debian_bundle import deb822
+from daklib import database
+from daklib import queue
+from daklib import utils
+
+################################################################################
+
+row_number = 1
+
+html_escaping = {'"':'"', '&':'&', '<':'<', '>':'>'}
+re_html_escaping = re.compile('|'.join(map(re.escape, html_escaping.keys())))
+def html_escape(s):
+ return re_html_escaping.sub(lambda x: html_escaping.get(x.group(0)), s)
+
+################################################################################
+
+def header():
+ return """<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+ <html><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+ <title>Deferred uploads to Debian</title>
+ <link type="text/css" rel="stylesheet" href="style.css">
+ <link rel="shortcut icon" href="http://www.debian.org/favicon.ico">
+ </head>
+ <body>
+ <div align="center">
+ <a href="http://www.debian.org/">
+ <img src="http://www.debian.org/logos/openlogo-nd-50.png" border="0" hspace="0" vspace="0" alt=""></a>
+ <a href="http://www.debian.org/">
+ <img src="http://www.debian.org/Pics/debian.png" border="0" hspace="0" vspace="0" alt="Debian Project"></a>
+ </div>
+ <br />
+ <table class="reddy" width="100%">
+ <tr>
+ <td class="reddy">
+ <img src="http://www.debian.org/Pics/red-upperleft.png" align="left" border="0" hspace="0" vspace="0"
+ alt="" width="15" height="16"></td>
+ <td rowspan="2" class="reddy">Deferred uploads to Debian</td>
+ <td class="reddy">
+ <img src="http://www.debian.org/Pics/red-upperright.png" align="right" border="0" hspace="0" vspace="0"
+ alt="" width="16" height="16"></td>
+ </tr>
+ <tr>
+ <td class="reddy">
+ <img src="http://www.debian.org/Pics/red-lowerleft.png" align="left" border="0" hspace="0" vspace="0"
+ alt="" width="16" height="16"></td>
+ <td class="reddy">
+ <img src="http://www.debian.org/Pics/red-lowerright.png" align="right" border="0" hspace="0" vspace="0"
+ alt="" width="15" height="16"></td>
+ </tr>
+ </table>
+ """
+
+def footer():
+ res = "<p class=\"validate\">Timestamp: %s (UTC)</p>" % (time.strftime("%d.%m.%Y / %H:%M:%S", time.gmtime()))
+ res += """<a href="http://validator.w3.org/check?uri=referer">
+ <img border="0" src="http://www.w3.org/Icons/valid-html401" alt="Valid HTML 4.01!" height="31" width="88"></a>
+ <a href="http://jigsaw.w3.org/css-validator/check/referer">
+ <img border="0" src="http://jigsaw.w3.org/css-validator/images/vcss" alt="Valid CSS!"
+ height="31" width="88"></a>
+ """
+ res += "</body></html>"
+ return res
+
+def table_header():
+ return """<h1>Deferred uploads</h1>
+ <center><table border="0">
+ <tr>
+ <th align="center">Change</th>
+ <th align="center">Time remaining</th>
+ <th align="center">Uploader</th>
+ <th align="center">Closes</th>
+ </tr>
+ """
+ return res
+
+def table_footer():
+ return '</table><br/><p>non-NEW uploads are <a href="/deferred/">available</a>, use <tt>dcut reschedule foo.changes X-day</tt> to adjust delays.</p></center><br/>\n'
+
+def table_row(changesname, delay, changed_by, closes):
+ global row_number
+
+ res = '<tr class="%s">'%((row_number%2) and 'odd' or 'even')
+ res += (3*'<td valign="top">%s</td>')%tuple(map(html_escape,(changesname,delay,changed_by)))
+ res += ('<td valign="top">%s</td>' %
+ ''.join(map(lambda close: '<a href="http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=%s">#%s</a><br>' % (close, close),closes)))
+ res += '</tr>\n'
+ row_number+=1
+ return res
+
+def get_upload_data(changesfn):
+ achanges = deb822.Changes(file(changesfn))
+ changesname = os.path.basename(changesfn)
+ delay = os.path.basename(os.path.dirname(changesfn))
+ m = re.match(r'([0-9]+)-day', delay)
+ if m:
+ delaydays = int(m.group(1))
+ remainingtime = (delaydays>0)*max(0,24*60*60+os.stat(changesfn).st_mtime-time.time())
+ delay = "%d days %02d:%02d" %(max(delaydays-1,0), int(remainingtime/3600),int(remainingtime/60)%60)
+ else:
+ remainingtime = 0
+
+ uploader = achanges.get('changed-by')
+ 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)
+ if 'unstable' not in suites and 'experimental' not in suites:
+ isnew = 1
+ for b in achanges['binary'].split():
+ suites = database.get_suites(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.
+ for afn in map(lambda x: x['name'],achanges['files']):
+ lfn = os.path.join(Cnf["Show-Deferred::LinkPath"],afn)
+ qfn = os.path.join(os.path.dirname(changesfn),afn)
+ if os.path.islink(lfn):
+ os.unlink(lfn)
+ os.symlink(qfn,lfn)
+ os.chmod(qfn, 0644)
+ return (delaydays*24*60*60+remainingtime, changesname, delay, uploader, achanges.get('closes').split())
+
+def list_uploads(filelist):
+ uploads = map(get_upload_data, filelist)
+ uploads.sort()
+ print header()
+ if uploads:
+ print table_header()
+ print ''.join(map(lambda x: table_row(*x[1:]), uploads))
+ print table_footer()
+ else:
+ print '<h1>Currently no deferred uploads to Debian</h1>'
+ print footer()
+
+def usage (exit_code=0):
+ if exit_code:
+ f = sys.stderr
+ else:
+ f = sys.stdout
+ print >> f, """Usage: dak show-deferred /path/to/DEFERRED
+ -h, --help show this help and exit.
+ -p, --html-path [path] override output directory.
+ """
+ sys.exit(exit_code)
+
+def init():
+ global Cnf, Options, Upload, projectB
+ Cnf = utils.get_conf()
+ Arguments = [('h',"help","Show-Deferred::Options::Help"),
+ ("p","link-path","Show-Deferred::LinkPath","HasArg")]
+ for i in ["help"]:
+ if not Cnf.has_key("Show-Deferred::Options::LinkPath"):
+ Cnf["Show-Deferred::Options::LinkPath"] = "/org/ftp.debian.org/web/deferred/"
+ if not Cnf.has_key("Show-Deferred::Options::%s" % (i)):
+ Cnf["Show-Deferred::Options::%s" % (i)] = ""
+ args = apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv)
+ Options = Cnf.SubTree("Show-Deferred::Options")
+ if Options["help"]:
+ usage()
+ Upload = queue.Upload(Cnf)
+ projectB = Upload.projectB
+ return args
+
+args = init()
+if len(args)!=1:
+ usage(1)
+
+filelist = []
+for r,d,f in os.walk(args[0]):
+ filelist += map (lambda x: os.path.join(r,x),
+ filter(lambda x: x.endswith('.changes'), f))
+list_uploads(filelist)
+
+if Cnf.has_key("Show-Deferred::LinkPath"):
+ # remove dead links
+ for r,d,f in os.walk(Cnf["Show-Deferred::LinkPath"]):
+ for af in f:
+ af = os.path.join(r,af)
+ if not os.path.exists(af):
+ print >> sys.stderr, "obsolete",af
+ os.unlink(af)
diff --git a/tools/debianqueued-0.9/show-deferred b/tools/debianqueued-0.9/show-deferred
deleted file mode 100755
index ab3fe5a..0000000
--- a/tools/debianqueued-0.9/show-deferred
+++ /dev/null
@@ -1,208 +0,0 @@
-#!/usr/bin/env python
-
-# based on queue-report
-# Copyright (C) 2001, 2002, 2003, 2005, 2006 James Troup <james@...>
-# Copyright (C) 2008 Thomas Viehmann <tv@...>
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-################################################################################
-
-import sys, os, re, time
-import apt_pkg
-from debian_bundle import deb822
-from daklib import database
-from daklib import queue
-from daklib import utils
-
-################################################################################
-
-row_number = 1
-
-html_escaping = {'"':'"', '&':'&', '<':'<', '>':'>'}
-re_html_escaping = re.compile('|'.join(map(re.escape, html_escaping.keys())))
-def html_escape(s):
- return re_html_escaping.sub(lambda x: html_escaping.get(x.group(0)), s)
-
-################################################################################
-
-def header():
- return """<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
- <html><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8">
- <title>Deferred uploads to Debian</title>
- <link type="text/css" rel="stylesheet" href="style.css">
- <link rel="shortcut icon" href="http://www.debian.org/favicon.ico">
- </head>
- <body>
- <div align="center">
- <a href="http://www.debian.org/">
- <img src="http://www.debian.org/logos/openlogo-nd-50.png" border="0" hspace="0" vspace="0" alt=""></a>
- <a href="http://www.debian.org/">
- <img src="http://www.debian.org/Pics/debian.png" border="0" hspace="0" vspace="0" alt="Debian Project"></a>
- </div>
- <br />
- <table class="reddy" width="100%">
- <tr>
- <td class="reddy">
- <img src="http://www.debian.org/Pics/red-upperleft.png" align="left" border="0" hspace="0" vspace="0"
- alt="" width="15" height="16"></td>
- <td rowspan="2" class="reddy">Deferred uploads to Debian</td>
- <td class="reddy">
- <img src="http://www.debian.org/Pics/red-upperright.png" align="right" border="0" hspace="0" vspace="0"
- alt="" width="16" height="16"></td>
- </tr>
- <tr>
- <td class="reddy">
- <img src="http://www.debian.org/Pics/red-lowerleft.png" align="left" border="0" hspace="0" vspace="0"
- alt="" width="16" height="16"></td>
- <td class="reddy">
- <img src="http://www.debian.org/Pics/red-lowerright.png" align="right" border="0" hspace="0" vspace="0"
- alt="" width="15" height="16"></td>
- </tr>
- </table>
- """
-
-def footer():
- res = "<p class=\"validate\">Timestamp: %s (UTC)</p>" % (time.strftime("%d.%m.%Y / %H:%M:%S", time.gmtime()))
- res += """<a href="http://validator.w3.org/check?uri=referer">
- <img border="0" src="http://www.w3.org/Icons/valid-html401" alt="Valid HTML 4.01!" height="31" width="88"></a>
- <a href="http://jigsaw.w3.org/css-validator/check/referer">
- <img border="0" src="http://jigsaw.w3.org/css-validator/images/vcss" alt="Valid CSS!"
- height="31" width="88"></a>
- """
- res += "</body></html>"
- return res
-
-def table_header():
- return """<h1>Deferred uploads</h1>
- <center><table border="0">
- <tr>
- <th align="center">Change</th>
- <th align="center">Time remaining</th>
- <th align="center">Uploader</th>
- <th align="center">Closes</th>
- </tr>
- """
- return res
-
-def table_footer():
- return '</table><br/><p>non-NEW uploads are <a href="/deferred/">available</a>, use <tt>dcut reschedule foo.changes X-day</tt> to adjust delays.</p></center><br/>\n'
-
-def table_row(changesname, delay, changed_by, closes):
- global row_number
-
- res = '<tr class="%s">'%((row_number%2) and 'odd' or 'even')
- res += (3*'<td valign="top">%s</td>')%tuple(map(html_escape,(changesname,delay,changed_by)))
- res += ('<td valign="top">%s</td>' %
- ''.join(map(lambda close: '<a href="http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=%s">#%s</a><br>' % (close, close),closes)))
- res += '</tr>\n'
- row_number+=1
- return res
-
-def get_upload_data(changesfn):
- achanges = deb822.Changes(file(changesfn))
- changesname = os.path.basename(changesfn)
- delay = os.path.basename(os.path.dirname(changesfn))
- m = re.match(r'([0-9]+)-day', delay)
- if m:
- delaydays = int(m.group(1))
- remainingtime = (delaydays>0)*max(0,24*60*60+os.stat(changesfn).st_mtime-time.time())
- delay = "%d days %02d:%02d" %(max(delaydays-1,0), int(remainingtime/3600),int(remainingtime/60)%60)
- else:
- remainingtime = 0
- #print dir(achanges)
- print >> sys.stderr, achanges.keys(), achanges['binary']
- uploader = achanges.get('changed-by')
- 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)
- if 'unstable' not in suites and 'experimental' not in suites:
- isnew = 1
- for b in achanges['binary'].split():
- suites = database.get_suites(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.
- for afn in map(lambda x: x['name'],achanges['files']):
- lfn = os.path.join(Cnf["Show-Deferred::LinkPath"],afn)
- qfn = os.path.join(os.path.dirname(changesfn),afn)
- if os.path.islink(lfn):
- os.unlink(lfn)
- os.symlink(qfn,lfn)
- os.chmod(qfn, 0644)
- return (delaydays*24*60*60+remainingtime, changesname, delay, uploader, achanges.get('closes').split())
-
-def list_uploads(filelist):
- uploads = map(get_upload_data, filelist)
- uploads.sort()
- print header()
- if uploads:
- print table_header()
- print ''.join(map(lambda x: table_row(*x[1:]), uploads))
- print table_footer()
- else:
- print '<h1>Currently no deferred uploads to Debian</h1>'
- print footer()
-
-def usage (exit_code=0):
- if exit_code:
- f = sys.stderr
- else:
- f = sys.stdout
- print >> f, """Usage: dak show-deferred /path/to/DEFERRED
- -h, --help show this help and exit.
- -p, --html-path [path] override output directory.
- """
- sys.exit(exit_code)
-
-def init():
- global Cnf, Options, Upload, projectB
- Cnf = utils.get_conf()
- Arguments = [('h',"help","Show-Deferred::Options::Help"),
- ("p","link-path","Show-Deferred::LinkPath","HasArg")]
- for i in ["help"]:
- if not Cnf.has_key("Show-Deferred::Options::LinkPath"):
- Cnf["Show-Deferred::Options::LinkPath"] = "/org/ftp.debian.org/web/deferred/"
- if not Cnf.has_key("Show-Deferred::Options::%s" % (i)):
- Cnf["Show-Deferred::Options::%s" % (i)] = ""
- args = apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv)
- Options = Cnf.SubTree("Show-Deferred::Options")
- if Options["help"]:
- usage()
- Upload = queue.Upload(Cnf)
- projectB = Upload.projectB
- return args
-
-args = init()
-if len(args)!=1:
- usage(1)
-
-filelist = []
-for r,d,f in os.walk(args[0]):
- filelist += map (lambda x: os.path.join(r,x),
- filter(lambda x: x.endswith('.changes'), f))
-list_uploads(filelist)
-
-if Cnf.has_key("Show-Deferred::LinkPath"):
- # remove dead links
- for r,d,f in os.walk(Cnf["Show-Deferred::LinkPath"]):
- for af in f:
- af = os.path.join(r,af)
- if not os.path.exists(af):
- print >> sys.stderr, "obsolete",af
- os.unlink(af)
--
1.5.6.5

--
To UNSUBSCRIBE, email to debian-dak-request@...
with a subject of "unsubscribe". Trouble? Contact listmaster@...

[dak/master] implement public access to deferred

2008-10-06T13:41:01Z

---
ChangeLog | 4 ++
daklib/database.py | 9 ++++
tools/debianqueued-0.9/ChangeLog | 6 ++-
tools/debianqueued-0.9/show-deferred | 74 ++++++++++++++++++++++++++++++---
4 files changed, 85 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 288c770..3e1620d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-10-05 Thomas Viehmann <tv@...>
+
+ * daklib/database.py: added get_suites
+
2008-09-23 Joerg Jaspert <joerg@...>

* config/debian/dak.conf: Add the validtime fields, set to 7
diff --git a/daklib/database.py b/daklib/database.py
index 9185d0a..1d9f3c0 100755
--- a/daklib/database.py
+++ b/daklib/database.py
@@ -389,3 +389,12 @@ def get_maintainer (maintainer_id):
return maintainer_cache[maintainer_id]

################################################################################
+
+def get_suites(pkgname, src=False):
+ if src:
+ sql = "select suite_name from source, src_associations,suite where source.id=src_associations.source and source.source='%s' and src_associations.suite = suite.id"%pkgname
+ else:
+ sql = "select suite_name from binaries, bin_associations,suite where binaries.id=bin_associations.bin and package='%s' and bin_associations.suite = suite.id"%pkgname
+ q = projectB.query(sql)
+ return map(lambda x: x[0], q.getresult())
+
diff --git a/tools/debianqueued-0.9/ChangeLog b/tools/debianqueued-0.9/ChangeLog
index cffd598..42e62ea 100644
--- a/tools/debianqueued-0.9/ChangeLog
+++ b/tools/debianqueued-0.9/ChangeLog
@@ -1,4 +1,8 @@
-2008-09-20 Thomas Viehmann <tv@...>
+2008-10-05 Thomas Viehmann <tv@...>
+
+ * show-deferred: make non-new uploads in deferred accessible
+
+2008-09-22 Thomas Viehmann <tv@...>

* show-deferred: minor fixes

diff --git a/tools/debianqueued-0.9/show-deferred b/tools/debianqueued-0.9/show-deferred
index fb5af52..ab3fe5a 100755
--- a/tools/debianqueued-0.9/show-deferred
+++ b/tools/debianqueued-0.9/show-deferred
@@ -21,7 +21,11 @@
################################################################################

import sys, os, re, time
+import apt_pkg
from debian_bundle import deb822
+from daklib import database
+from daklib import queue
+from daklib import utils

################################################################################

@@ -94,7 +98,7 @@ def table_header():
return res

def table_footer():
- return '</table></center><br>\n'
+ return '</table><br/><p>non-NEW uploads are <a href="/deferred/">available</a>, use <tt>dcut reschedule foo.changes X-day</tt> to adjust delays.</p></center><br/>\n'

def table_row(changesname, delay, changed_by, closes):
global row_number
@@ -119,9 +123,28 @@ def get_upload_data(changesfn):
else:
remainingtime = 0
#print dir(achanges)
- #print achanges.keys()
+ print >> sys.stderr, achanges.keys(), achanges['binary']
uploader = achanges.get('changed-by')
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)
+ if 'unstable' not in suites and 'experimental' not in suites:
+ isnew = 1
+ for b in achanges['binary'].split():
+ suites = database.get_suites(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.
+ for afn in map(lambda x: x['name'],achanges['files']):
+ lfn = os.path.join(Cnf["Show-Deferred::LinkPath"],afn)
+ qfn = os.path.join(os.path.dirname(changesfn),afn)
+ if os.path.islink(lfn):
+ os.unlink(lfn)
+ os.symlink(qfn,lfn)
+ os.chmod(qfn, 0644)
return (delaydays*24*60*60+remainingtime, changesname, delay, uploader, achanges.get('closes').split())

def list_uploads(filelist):
@@ -136,13 +159,50 @@ def list_uploads(filelist):
print '<h1>Currently no deferred uploads to Debian</h1>'
print footer()

-if len(sys.argv)!=2:
- print >> sys.stderr, """Error! Invoke %s /path/to/DEFERRED"""%sys.argv[0]
- sys.exit(1)
+def usage (exit_code=0):
+ if exit_code:
+ f = sys.stderr
+ else:
+ f = sys.stdout
+ print >> f, """Usage: dak show-deferred /path/to/DEFERRED
+ -h, --help show this help and exit.
+ -p, --html-path [path] override output directory.
+ """
+ sys.exit(exit_code)
+
+def init():
+ global Cnf, Options, Upload, projectB
+ Cnf = utils.get_conf()
+ Arguments = [('h',"help","Show-Deferred::Options::Help"),
+ ("p","link-path","Show-Deferred::LinkPath","HasArg")]
+ for i in ["help"]:
+ if not Cnf.has_key("Show-Deferred::Options::LinkPath"):
+ Cnf["Show-Deferred::Options::LinkPath"] = "/org/ftp.debian.org/web/deferred/"
+ if not Cnf.has_key("Show-Deferred::Options::%s" % (i)):
+ Cnf["Show-Deferred::Options::%s" % (i)] = ""
+ args = apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv)
+ Options = Cnf.SubTree("Show-Deferred::Options")
+ if Options["help"]:
+ usage()
+ Upload = queue.Upload(Cnf)
+ projectB = Upload.projectB
+ return args
+
+args = init()
+if len(args)!=1:
+ usage(1)

filelist = []
-for r,d,f in os.walk(sys.argv[1]):
+for r,d,f in os.walk(args[0]):
filelist += map (lambda x: os.path.join(r,x),
filter(lambda x: x.endswith('.changes'), f))
-
list_uploads(filelist)
+
+if Cnf.has_key("Show-Deferred::LinkPath"):
+ # remove dead links
+ for r,d,f in os.walk(Cnf["Show-Deferred::LinkPath"]):
+ for af in f:
+ af = os.path.join(r,af)
+ if not os.path.exists(af):
+ print >> sys.stderr, "obsolete",af
+ os.unlink(af)
--
1.5.6.5

--
To UNSUBSCRIBE, email to debian-dak-request@...
with a subject of "unsubscribe". Trouble? Contact listmaster@...

Re: patches for dak

2008-10-01T15:51:32Z

On 11525 March 1977, Allan Lyons wrote:

> I'm looking at using dak as a part of a project that I'm working on.
> If I end up with patches that make sense to include in dak, where
> would be the best place/person to send patches to?

Depending on the amount of stuff - patches send here using that git
function or a pointer to a git repo and the branch you want
merged. (Where the branches you want merged are up2date with latest
dak repositories master branch when you ask for a merge :) ).

--
bye, Joerg
Some NM:
graphviz: ouch, that license is hard to read, damn lawyer gibberish.

--
To UNSUBSCRIBE, email to debian-dak-request@...
with a subject of "unsubscribe". Trouble? Contact listmaster@...

[PATCH] remove linda from suggests since linda has been removed from debian since lenny. See debian bug# 469039

2008-10-01T14:31:50Z

---
debian/control | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/debian/control b/debian/control
index a44e363..6d24d03 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.5.6.0
Package: dak
Architecture: any
Depends: ${python:Depends}, python-pygresql, python2.1-email | python (>= 2.2), python-apt, apt-utils, gnupg (>= 1.0.6-1), ${shlibs:Depends}, dpkg-dev, python-syck (>= 0.61.2-1), libemail-send-perl
-Suggests: lintian, linda, less, binutils-multiarch, symlinks, postgresql (>= 7.1.0), dsync
+Suggests: lintian, less, binutils-multiarch, symlinks, postgresql (>= 7.1.0), dsync
Description: Debian's archive maintenance scripts
This is a collection of archive maintenance scripts used by the
Debian project.
--
1.5.6.5

--
To UNSUBSCRIBE, email to debian-dak-request@...
with a subject of "unsubscribe". Trouble? Contact listmaster@...

Re: patches for dak

2008-10-01T13:28:01Z

Allan Lyons <allan@...> writes:

> Hi,
>
> I'm looking at using dak as a part of a project that I'm working on. If I end up with patches
> that make sense to include in dak, where would be the best place/person to send patches to?

I believe that the easier way is to send git exported patches to this
mailing list.

--
O T A V I O S A L V A D O R
---------------------------------------------
E-mail: otavio@... UIN: 5906116
GNU/Linux User: 239058 GPG ID: 49A5F855
Home Page: http://otavio.ossystems.com.br
---------------------------------------------
"Microsoft sells you Windows ... Linux gives
you the whole house."

--
To UNSUBSCRIBE, email to debian-dak-request@...
with a subject of "unsubscribe". Trouble? Contact listmaster@...

patches for dak

2008-10-01T11:07:50Z

Hi,

I'm looking at using dak as a part of a project that I'm working on. If I end up with patches
that make sense to include in dak, where would be the best place/person to send patches to?

Thanks,

Allan.

--
To UNSUBSCRIBE, email to debian-dak-request@...
with a subject of "unsubscribe". Trouble? Contact listmaster@...

[dak/master] fix remaining days, some style

2008-09-30T11:00:42Z

---
tools/debianqueued-0.9/ChangeLog | 4 ++++
tools/debianqueued-0.9/show-deferred | 8 ++++----
2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/tools/debianqueued-0.9/ChangeLog b/tools/debianqueued-0.9/ChangeLog
index 0d9da28..cffd598 100644
--- a/tools/debianqueued-0.9/ChangeLog
+++ b/tools/debianqueued-0.9/ChangeLog
@@ -1,3 +1,7 @@
+2008-09-20 Thomas Viehmann <tv@...>
+
+ * show-deferred: minor fixes
+
2008-09-21 Joerg Jaspert <joerg@...>

* debianqueued: Use perltidy
diff --git a/tools/debianqueued-0.9/show-deferred b/tools/debianqueued-0.9/show-deferred
index 9cb093d..fb5af52 100755
--- a/tools/debianqueued-0.9/show-deferred
+++ b/tools/debianqueued-0.9/show-deferred
@@ -25,7 +25,7 @@ from debian_bundle import deb822

################################################################################

-row_number = 0
+row_number = 1

html_escaping = {'"':'"', '&':'&', '<':'<', '>':'>'}
re_html_escaping = re.compile('|'.join(map(re.escape, html_escaping.keys())))
@@ -99,7 +99,7 @@ def table_footer():
def table_row(changesname, delay, changed_by, closes):
global row_number

- res = '<tr class="%s">'%(['even','odd'][row_number %2])
+ res = '<tr class="%s">'%((row_number%2) and 'odd' or 'even')
res += (3*'<td valign="top">%s</td>')%tuple(map(html_escape,(changesname,delay,changed_by)))
res += ('<td valign="top">%s</td>' %
''.join(map(lambda close: '<a href="http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=%s">#%s</a><br>' % (close, close),closes)))
@@ -114,8 +114,8 @@ def get_upload_data(changesfn):
m = re.match(r'([0-9]+)-day', delay)
if m:
delaydays = int(m.group(1))
- remainingtime = max(0,24*60*60+os.stat(changesfn).st_mtime-time.time())
- delay = "%d days %02d:%02d" %(delaydays, int(remainingtime/3600),int(remainingtime/60)%60)
+ remainingtime = (delaydays>0)*max(0,24*60*60+os.stat(changesfn).st_mtime-time.time())
+ delay = "%d days %02d:%02d" %(max(delaydays-1,0), int(remainingtime/3600),int(remainingtime/60)%60)
else:
remainingtime = 0
#print dir(achanges)
--
1.5.6.5

--
To UNSUBSCRIBE, email to debian-dak-request@...
with a subject of "unsubscribe". Trouble? Contact listmaster@...