Joey Hess writes ("Re: Bug#720522: cannot NMU dgit using dgit"):
> Ian Jackson wrote:
> > Please go ahead, but into experimental. You will probably want to use
> > 0.8 which I have just pushed.
> >
> > You should be able to make an "empty" NMU by just adding a
> > debian/changelog entry.
>
> I did this successfully. However, my first build attempt failed
> because git-buildpackage wanted to be on an experimental branch rather
> than the sid branch dget clone set up.
I guess this was using git-buildpackage directly ? dgit build would
canonicalise "experimental" to "sid" and pass the result to
git-buildpackage.
> My next build failed because I ran dpkg-buildpackage in my usual way,
> which includes -I, and this excluded .gitignore from the tarball. The
> source consistency check then failed.
I guess this was dpkg-buildpackage directly. Yes, this is why I
provided dgit build.
> So then I tried leaving -I off, but of course this included the whole
> .git directory in the tarball, which was clearly wrong.
Yes.
> I then tried dgit build --git-ignore-branch. This built the right
> tarball, but I was a bit worried that dgit push might push to the sid
> branch, which I was currently on. I decided to go ahead with the push,
> on the basis that if I did something wrong you'd have a nice test case to
> fix in dgit.git. It seems to have done the right thing in the end. The
> rest of the push succeeded.
Yes. It won't push to the wrong branch - it uses the value from the
changelog, not the local git branch.
> Seems that some of this could be improved, but I don't know how, other
> than perhaps passing --git-ignore-branch to git-buildpackage by default.
Perhaps that would be best. It would also avoid the need to try to
canonicalise the suite name.
> (Probably doesn't help that I have never bothered to learn
> git-buildpackage, since I considered it a fundamentally wrong approach
> to the problem, and insanely complicated for what it does. It is thus
> somewhat disconcerting to see it used in dgit..)
It's optional. If you use "dgit sbuild" it doesn't get used at all.
"dgit build" uses git-buildpackage in a pretty simple mode. Maybe it
would be best for it to just use dpkg-buildpackage directly now that
"dgit sbuild" has much of the same infrastructure.
Ian.
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
