hi, On Wed, Dec 12, 2012 at 05:30:27PM +0100, gregor herrmann wrote: ... > So it seems that g-i-o still happily imports the original tarball and > not the repackaged one. > > > The problem is still that the name of the new tarball is only > reported as a message by uscan which is not parsed by > /usr/share/pyshared/gbp/deb/uscan.py if I'm reading ot correctly.
Yes that's right.
I changed the patch... (it was quite straight forward, it is the same code
somewhere else doing the same.)
------------------------
--- /usr/share/pyshared/gbp/deb/uscan.py-orig 2012-12-13 09:09:13.250558008
+0100
+++ /usr/share/pyshared/gbp/deb/uscan.py 2012-12-13 09:09:23.306558006
+0100
@@ -101,6 +101,12 @@
except KeyError as e:
raise UscanError("Couldn't find '%s' in uscan output" %
e.args[0])
+ # perl repack support #635920
+ for row in out.split("\n"):
+ m = re.match(r"\*\*\* ([^\s]+) ready", row)
+ if m:
+ source = "%s" % m.group(1)
+ break
self._tarball = source
def _parse_uptodate(self, out):
------------------------
A quick test (the same one as before) indicates that it works fine:
% gbp-clone --all --pristine-tar
git://git.debian.org/pkg-perl/packages/libdata-ical-perl.git
Branch pristine-tar set up to track remote branch pristine-tar from origin.
Branch upstream set up to track remote branch upstream from origin.
% cd libdata-ical-perl
% git-import-orig --uscan
gbp:info: Launching uscan...
gbp:info: using ../libdata-ical-perl_0.19+dfsg.orig.tar.gz
What is the upstream version? [0.19+dfsg]
gbp:info: Importing '../libdata-ical-perl_0.19+dfsg.orig.tar.gz' to branch
'upstream'...
gbp:info: Source package is libdata-ical-perl
gbp:info: Upstream version is 0.19+dfsg
gbp:info: Merging to 'master'
Merge made by the 'recursive' strategy.
gbp:info: Successfully imported version 0.19+dfsg of
../libdata-ical-perl_0.19+dfsg.orig.tar.gz
% ls doc
ls: cannot access doc: No such file or directory
Regards,
cstamas
--
CSILLAG Tamas (cstamas) - http://cstamas.hu/
Life is complex - It has real and imaginary parts.
-- Andrea Leistra
signature.asc
Description: Digital signature
