tag 652414 unreproducible moreinfo
thanks

On Fri, 16 Dec 2011, Sam Hartman wrote:
> based on the man page if I run dpkg-source --commit . patch_name foo.patch
> 
> I'd expect that the  original tarball would not be needed.
> As far as I can tell the program seems to actually ignore the third
> argument and tries to build the  diff itself.

Do you have a test-case to reproduce this? Because I tried to reproduce the
problem and I did not manage it, at least not with a "3.0 (quilt)" source
package. I'm running git master (+ multiarch) but I don't think it has any
relevant difference.

I modified a file, ran dpkg-source -b, it failed with:
$ debuild -S
[...]
dpkg-source: info: local changes detected, the modified files are:
 zim-0.53/PKG-INFO
dpkg-source: erreur: aborting due to unexpected upstream changes, see 
/tmp/zim_0.53-1.diff.FeqVUc

Then I moved the .orig away and ran dpkg-source commit:
$ mv ../zim_0.53.orig.tar.gz ../zim_0.53.orig.tar.gz.disabled
$ dpkg-source --commit . misc /tmp/zim_0.53-1.diff.FeqVUc
dpkg-source: info: utilisation des options depuis 
zim-0.53/debian/source/options : 
--extend-diff-ignore=(^|/)locale/[^/]+/LC_MESSAGES/zim\.mo$ 
--extend-diff-ignore=(^|/)xdg/hicolor/.*\.png$ --tar-ignore=debian/fake-home
dpkg-source: info: les modifications locales ont été enregistrées dans un 
nouveau patch: zim-0.53/debian/patches/misc

(The messages are in French but it just worked)

> Based on the man page I'd expect the three argument form of
> dpkg-source --commit to roughly copy the third argument into
> debian/patches, possibly adding a header, and opening it in an editor.
> Then add to the series files.

That's what it did here.

Cheers,
-- 
Raphaël Hertzog ◈ Debian Developer

Pre-order a copy of the Debian Administrator's Handbook and help
liberate it: http://debian-handbook.info/liberation/



--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]

Reply via email to