diff options
-rwxr-xr-x | patchtracker/ReqHandler.py | 4 | ||||
-rwxr-xr-x | patchtracker/Templates.py | 19 |
2 files changed, 1 insertions, 22 deletions
diff --git a/patchtracker/ReqHandler.py b/patchtracker/ReqHandler.py index 90fc75a..da23525 100755 --- a/patchtracker/ReqHandler.py +++ b/patchtracker/ReqHandler.py @@ -5,7 +5,7 @@ import os import sys import patchtracker.Conf as Conf -from patchtracker.Templates import ErrorTemplate, PatchTemplate, PackageVersTemplate, LetterTocTemplate, FrontPageTemplate, SearchResultsTemplate +from patchtracker.Templates import ErrorTemplate, PatchTemplate, LetterTocTemplate, FrontPageTemplate, SearchResultsTemplate from patchtracker.DiffGzHandler import DiffGzHandler, DiffGzException from patchtracker.DebTarHandler import DebTarHandler from patchtracker.CacheObject import CacheObject, CacheMissException @@ -116,8 +116,6 @@ class PackageCmd(Cmd): if not p or len(set(map(lambda x: x.version, p.values()))) > 1: querydesc = "package name contains" return str(SearchResultsTemplate(self.name, querydesc, self.toc)) - else: - return str(PackageVersTemplate(p.popitem()[1])) class IndexCmd(Cmd): def __init__(self, args): diff --git a/patchtracker/Templates.py b/patchtracker/Templates.py index 42140a8..7d599c5 100755 --- a/patchtracker/Templates.py +++ b/patchtracker/Templates.py @@ -30,25 +30,6 @@ class OurTemplate(Template): the unicode zero-whitespace-break character (​) """ return '​'.join([version[i:i+12] for i in range(0,len(version),12)]) -class PackageVersTemplate(OurTemplate): - def __init__(self, srcpkg): - self.src = srcpkg - tpl=os.sep.join([Conf.template_dir, "package_vers.tmpl"]) - sl = {} - # XXX c/p from PatchCmd.make_diffhandler - db = DB.PatchTrackerDB() - dfile = db.findDiffGz(srcpkg.name,srcpkg.version) - if dfile: - sl['diffhandler'] = DiffGzHandler(dfile) - else: - dfile = db.findDebTar(srcpkg.name, srcpkg.version) - if dfile: - sl['diffhandler'] = DebTarHandler(dfile) - sl['crumbs'] = [("package/"+srcpkg.name,srcpkg.name), - ("package/"+srcpkg.name+"/"+srcpkg.version, - srcpkg.name+"/"+srcpkg.version)] - OurTemplate.__init__(self, file=tpl, searchList=sl) - class FrontPageTemplate(OurTemplate): def __init__(self, indices): tpl = os.sep.join([Conf.template_dir, "frontpage.tmpl"]) |