On Sun, Dec 30, 2018 at 12:53:18PM +0100, Guido Günther wrote: > > I noticed that the pristine-tar tarball id for the source is incorrect > > if the set of orig-tarballs are imported with > > > > gbp-import-orig XXX.orig.tar.xz --components YYY > > > > For example, after importing the opencv tarball, I have to manually > > fix the reference for the main component, while the id "contrib" > > component is correct: > > By incorrect I _assume_ you mean it's pointing to the wrong tree? gbp > basically passes on data to pristine tar - it doesn't calculate these > things by itself so I would again _assume_ it's pointing pristine-tar to > the wrong git tree? Which tree is it pointing as in your case and which > tree should it point at? > The whole machinery is in use by e.g. thunderbird since some time so I > don't think it completely bogus. > -- Guido
Yes, it's pointing to a wrong tree. The correct reference should be ~/D/o/opencv ❯❯❯ git cat-file -p upstream tree a18a03170473e1773e1f571e561441bc83a3861e However gbp/pristine-tar refers a67d0acc9952eb94c9dc0f50eb1f73777695418e (I don't know what this hash points to) Another observation is that, the tarball can be checked out from the repo where orig tarballs were imported. But after cloning the repo to another machine, doing the same checkout would end up with failure, even if all branches and commits have been pushed. > > > > opencv_3.4.5+dfsg.orig.tar.xz.id INCORRECT > > opencv_3.4.5+dfsg.orig-contrib.tar.xz.id CORRECT > > > > https://salsa.debian.org/science-team/opencv/commit/a0bd84b30b388b9811bc300e9a62801cf89c8966 > > > > It seems that the /tree/ hash is the correct one for the master > > component (Mattia tought me this but I don't understand what's going on): > > > > git cat-file -p upstream # /tree/ main component > >
