Hi,
On Mon, Jun 11, 2018 at 11:59:58AM +0200, Jonas Smedegaard wrote:
> Quoting Guido Günther (2018-06-11 11:07:33)
> > On Mon, Jun 11, 2018 at 11:04:51AM +0200, Guido Günther wrote:
> > > On Mon, Jun 11, 2018 at 10:01:44AM +0200, Jonas Smedegaard wrote:
> > > > Package: git-buildpackage
> > > > Version: 0.9.9
> > > > Severity: grave
> > > > Justification: causes non-serious data loss
> > > >
> > > > -----BEGIN PGP SIGNED MESSAGE-----
> > > > Hash: SHA512
> > > >
> > > > "gbp import-orig --uscan" seems to choke on tarballs repacked by
> > > > uscan.
> > > >
> > > > With the attached debian files - changelog, copyright, and watch,
> > > > in an freshly created git project (i.e. just "git init"), doing
> > > > "gbp import-orig --uscan" will succeed but the resulting project
> > > > wil be missing the subdirectories translations and utils.
> > > >
> > > > Doing same without the copyright file will have all files
> > > > imported.
> > > >
> > > > The repacked tarball do contain the subdirectories, so it seems
> > > > gbp chokes on it for some reason.
> > >
> > > I rather assume thath the copyright file instructs uscan to filter
> > > these out?
> >
> > Oh...and as always: please provide data to reproduce the problem. Your
> > package is certainly not the first to be imported with --uscan and
> > since it works for some setups it would be good to have your test case
> > to find out what's different.
>
> I believe I did exactly that: Provide files to reproduce the problem.
I was expecting a git URL and overread the "attached", found the files
now, sorry for the confusion.
> Could you elaborate which kind of files you would like me to provide?
The tarball generated by uscan "monero_0.12.2.0~dfsg.orig.tar.gz" does
not contain the directories you mention. When I run this:
$ git branch upstream
$ gbp import-orig -v --merge-mode=replace --postimport=/bin/true
--no-pristine-tar --no-sign --uscan
…
$ DIRS='translations|utils' ; tar -list -af
monero_0.12.2.0~dfsg.orig.tar.gz | grep -qs -E "(${DIRS})/" || echo "${DIRS}
not found"
translations|utils not found
Can you show me what I'm missing to reproduce this?
(Note that I've specified the merge mode explicitly since your package
does not provide a debian/source/format and so 1.0 is assumed which
merges upstream to master thereby (correctly) reverting your debian/ dir
(since is not contained in upsream/ and they have the same parent) - but
this is unrelated to your issue).
Cheers,
-- Guido
