From 214268f80d89d279be7fb046f7fa3bde048af793 Mon Sep 17 00:00:00 2001 From: Sean Finney Date: Sun, 26 Jul 2009 13:28:10 +0200 Subject: changes to work with >> lenny versions of reprepro and python-debian reprepro now seems to default to passching the lists files uncompressed to the hook, so we deal with that gracefully either way. python-debian seems to have slightly changed how it handles some multiline fields due to starting to use the built-in apt_pkg module, see the comments in Conf.py which should point to the bug. --- reprepro/conf/diffsonly.py | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) (limited to 'reprepro') diff --git a/reprepro/conf/diffsonly.py b/reprepro/conf/diffsonly.py index e40e1aa..286d367 100755 --- a/reprepro/conf/diffsonly.py +++ b/reprepro/conf/diffsonly.py @@ -5,6 +5,8 @@ from gzip import GzipFile from fnmatch import fnmatch import sys +import patchtracker.Conf as Conf + if __name__ == '__main__': try: (prog,src,dst) = sys.argv @@ -13,7 +15,19 @@ if __name__ == '__main__': sys.exit(1) inf = sys.argv[1] - slist = deb822.Sources.iter_paragraphs(GzipFile(inf)) + fh = None + slist = [] + if fnmatch(inf, "*.gz"): + fh = GzipFile(inf) + else: + fh = file(inf) + + # temp workaround for #538376 + if Conf.use_apt_pkg is not None: + slist = deb822.Sources.iter_paragraphs(fh, use_apt_pkg=Conf.use_apt_pkg) + else: + slist = deb822.Sources.iter_paragraphs(fh) + outf = file(sys.argv[2], "w") print "filtering %s for .diff.gz/.dsc files..."%(inf) for ent in slist: -- cgit v1.2.3