From a61726f8b8f0d75f56e5c9159302d5f1fe23f43f Mon Sep 17 00:00:00 2001 From: Sean Finney Date: Tue, 9 Nov 2010 00:19:54 +0100 Subject: fix static path to maintenance cat --- static/500.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/static/500.html b/static/500.html index 2663c7a..84008ae 100644 --- a/static/500.html +++ b/static/500.html @@ -5,20 +5,20 @@ Oh noes! Error! + href="/static/css/patches.css"/>

Oh noes! An error!

- [maintenance cat] + [maintenance cat]

The system is currently unavailable. Please wait for it to become available again. -- cgit v1.2.3 From a5be1b0846194a49fa7d256bd829e035bbf6ddbd Mon Sep 17 00:00:00 2001 From: Sean Finney Date: Sun, 20 Feb 2011 20:57:02 +0100 Subject: etch is out, wheezy is in --- README | 7 ++++--- patchtracker/SourceArchive.py | 12 ++++++------ reprepro/conf/distributions | 8 ++++---- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/README b/README index b2cce72..299bef8 100644 --- a/README +++ b/README @@ -21,9 +21,10 @@ required software: first, you need a partial source archive, with the .dsc, diff.gz, Release, and Sources.gz files available. there's a sample config in the subdir ./reprepro, if you don't have one handy. Using a devious little python -filter, it will fetch the dsc and diff.gz files from etch/lenny/sid without -fetching the rest of the debs/tarballs, which should keep the archive size -down a bit (though it should also work just fine on a normal archive too). +filter, it will fetch the dsc and diff.gz files from the various releases +without fetching the rest of the debs/tarballs, which should keep the +archive size down a bit (though it should also work just fine on a normal +archive too). so, you have your source archive available, and installed somewhere. next set up a web server, and configure it to serve up the application from diff --git a/patchtracker/SourceArchive.py b/patchtracker/SourceArchive.py index 0cdeb10..9f30c58 100755 --- a/patchtracker/SourceArchive.py +++ b/patchtracker/SourceArchive.py @@ -174,7 +174,7 @@ class ReleaseList: self.project = project # XXX this is hard coded for now... self.relorder = {} - self.relorder["debian"] = ["etch", "lenny", "squeeze", "sid", "experimental"] + self.relorder["debian"] = ["lenny", "squeeze", "wheezy", "sid", "experimental"] def __iter__(self): for r in self.relorder[self.project]: @@ -185,17 +185,17 @@ if __name__ == "__main__": import Conf import sys import copy - a = Archive(sys.argv[1], suitefilter=["etch"]) + a = Archive(sys.argv[1], suitefilter=["lenny"]) b = copy.deepcopy(a) b.addsuite("lenny") - b.addcomponent("etch", "something") + b.addcomponent("lenny", "something") class x: def __init__(self,name): self.name=name - b.addsourcepackage("etch","main",x("foo")) + b.addsourcepackage("lenny","main",x("foo")) print "suite diff" print "\n".join( ArchiveDiffer().diffsuites(a,b) ) print "component diff" - print "\n".join( ArchiveDiffer().diffcomponents(a,b,"etch") ) + print "\n".join( ArchiveDiffer().diffcomponents(a,b,"lenny") ) print "package diff" - print "\n".join( ArchiveDiffer().diffsourcepackages(a,b,"etch","main") ) + print "\n".join( ArchiveDiffer().diffsourcepackages(a,b,"lenny","main") ) diff --git a/reprepro/conf/distributions b/reprepro/conf/distributions index 0db0205..52ee979 100644 --- a/reprepro/conf/distributions +++ b/reprepro/conf/distributions @@ -1,7 +1,3 @@ -Codename: etch -Architectures: source -Components: main contrib non-free - Codename: lenny Architectures: source Components: main contrib non-free @@ -12,6 +8,10 @@ Architectures: source Components: main contrib non-free Update: - debian +Codename: wheezy +Architectures: source +Components: main contrib non-free + Codename: sid Architectures: source Components: main contrib non-free -- cgit v1.2.3 From 6bd03818dae68c8f2ec32159d21a02fa5b4f25fd Mon Sep 17 00:00:00 2001 From: Sean Finney Date: Sun, 20 Feb 2011 21:53:12 +0100 Subject: add missing Update line for wheezy --- reprepro/conf/distributions | 1 + 1 file changed, 1 insertion(+) diff --git a/reprepro/conf/distributions b/reprepro/conf/distributions index 52ee979..cd05817 100644 --- a/reprepro/conf/distributions +++ b/reprepro/conf/distributions @@ -11,6 +11,7 @@ Update: - debian Codename: wheezy Architectures: source Components: main contrib non-free +Update: - debian Codename: sid Architectures: source -- cgit v1.2.3 From 0e6d288bf4c21b043a02c6cc19367bb937397edd Mon Sep 17 00:00:00 2001 From: Sean Finney Date: Sun, 20 Feb 2011 23:00:31 +0100 Subject: First stab at extracting suites into a local conf value --- patchtracker/Conf.py | 6 ++++++ patchtracker/SourceArchive.py | 9 +++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/patchtracker/Conf.py b/patchtracker/Conf.py index e89a129..28820b5 100755 --- a/patchtracker/Conf.py +++ b/patchtracker/Conf.py @@ -38,6 +38,12 @@ archive_lists_compressed = False indication flag for the scripts that interact with it. """ +suites = None +""" Override the suites that should be tracked in the application. Should + be a chronologically ordered list and should correspond to the + seperately managed reprepro configuration. +""" + try: from localconfig import * except ImportError: diff --git a/patchtracker/SourceArchive.py b/patchtracker/SourceArchive.py index 9f30c58..b99e3a4 100755 --- a/patchtracker/SourceArchive.py +++ b/patchtracker/SourceArchive.py @@ -4,6 +4,7 @@ from fnmatch import fnmatch from gzip import GzipFile from debian_bundle import deb822 import difflib +from patchtracker import Conf class Archive: def __init__(self, dir, suitefilter=None, pkgfilter=None): @@ -28,6 +29,8 @@ class Archive: def parsesuites(self, filter=None): slist = os.listdir(self.distsdir) + if Conf.suites: + slist = set(Conf.suites).intersection(set(slist)) if filter: slist = set(filter).intersection(set(slist)) for s in sorted(slist): @@ -172,9 +175,11 @@ class ReleaseList: def __init__(self, project): self.project = project - # XXX this is hard coded for now... self.relorder = {} - self.relorder["debian"] = ["lenny", "squeeze", "wheezy", "sid", "experimental"] + if Conf.suites: + self.relorder["debian"] = Conf.suites + else: + self.relorder["debian"] = ["lenny", "squeeze", "wheezy", "sid", "experimental"] def __iter__(self): for r in self.relorder[self.project]: -- cgit v1.2.3