On Wed, Oct 10, 2018 at 12:40:17PM +0100, Ian Jackson wrote: > No, I meant, what is is mason/mason. From your message the answer is > `the result of dgit clone mason' ? If that were true you wouldn't > need --include-dirty.
Yes. Right, but this bug seems to be tied by --include-dirty… read on. > I want to be able to repro this bug. Can you give me a formal set of > "steps to reproduce" which start from an empty directory and use only > public data sources ? Thanks for prodding here. Indeed, trying to reproduce cleanly revealed that it is more involved than suspected. mattia@warren ~ % cd $(mktemp -d -p .) mattia@warren ~/tmp.gxs0VLD18C % apt source -d mason Reading package lists... Done Need to get 536 kB of source archives. Get:1 http://debian.anycast-test.mirrors.debian.org/debian unstable/main mason 1.0.0-12.4 (dsc) [1,646 B] Get:2 http://debian.anycast-test.mirrors.debian.org/debian unstable/main mason 1.0.0-12.4 (tar) [507 kB] Get:3 http://debian.anycast-test.mirrors.debian.org/debian unstable/main mason 1.0.0-12.4 (diff) [27.6 kB] Fetched 536 kB in 0s (1,239 kB/s) Download complete and in download only mode mattia@warren ~/tmp.gxs0VLD18C % dgit clone mason canonical suite name for unstable is sid starting new git history downloading http://ftp.debian.org/debian//pool/main/m/mason/mason_1.0.0-12.4.dsc... last upload to archive: NO git hash using existing mason_1.0.0.orig.tar.gz using existing mason_1.0.0-12.4.diff.gz dpkg-source: info: extracting mason in mason-1.0.0 dpkg-source: info: unpacking mason_1.0.0.orig.tar.gz dpkg-source: info: applying mason_1.0.0-12.4.diff.gz dpkg-source: info: upstream files that have been modified: mason-1.0.0/Makefile mason-1.0.0/baserules.sample mason-1.0.0/firewall mason-1.0.0/mason mason-1.0.0/mason-decide mason-1.0.0/mason-gui-text mason-1.0.0/mason-gui-text.1 mason-1.0.0/mason.1 mason-1.0.0/masonlib mason-1.0.0/masonrc mason-1.0.0/samlib mason-1.0.0/ttt synthesised git commit from .dsc 1.0.0-12.4 HEAD is now at 96b36c2 mason (1.0.0-12.4) unstable; urgency=medium dgit ok: ready for work in mason mattia@warren ~/tmp.gxs0VLD18C % ls -l total 532 drwxr-xr-x 5 mattia mattia 4096 Oct 10 13:55 mason -rw-r--r-- 1 mattia mattia 27602 Sep 24 11:51 mason_1.0.0-12.4.diff.gz -rw-r--r-- 1 mattia mattia 1646 Sep 24 11:51 mason_1.0.0-12.4.dsc -rw-r--r-- 1 mattia mattia 506940 Jul 2 2002 mason_1.0.0.orig.tar.gz mattia@warren ~/tmp.gxs0VLD18C % ls -l total 532 drwxr-xr-x 5 mattia mattia 4096 Oct 10 13:55 mason -rw-r--r-- 1 mattia mattia 27602 Sep 24 11:51 mason_1.0.0-12.4.diff.gz -rw-r--r-- 1 mattia mattia 1646 Sep 24 11:51 mason_1.0.0-12.4.dsc -rw-r--r-- 1 mattia mattia 506940 Jul 2 2002 mason_1.0.0.orig.tar.gz mattia@warren ~/tmp.gxs0VLD18C % cd mason mattia@warren ~/tmp.gxs0VLD18C/mason (git)-[dgit/sid] % dgit -wc build-source dpkg-source: warning: no source format specified in debian/source/format, see dpkg-source(1) dpkg-source: info: using source format '1.0' dpkg-source: warning: source directory 'work' is not <sourcepackage>-<upstreamversion> 'mason-1.0.0' dpkg-source: warning: .orig directory name work.orig is not <package>-<upstreamversion> (wanted mason-1.0.0.orig) dpkg-source: info: building mason using existing mason_1.0.0.orig.tar.gz dpkg-source: info: building mason in mason_1.0.0-12.4.diff.gz dpkg-source: warning: the diff modifies the following upstream files: Makefile baserules.sample firewall mason mason-decide mason-gui-text mason-gui-text.1 mason.1 masonlib masonrc samlib ttt dpkg-source: info: use the '3.0 (quilt)' format to have separate and documented changes to upstream files, see dpkg-source(1) dpkg-source: info: building mason in mason_1.0.0-12.4.dsc changelog will contain changes since 1.0.0-12.4 dpkg-genchanges: warning: 'since' option specifies most recent version '1.0.0-12.4', ignoring dpkg-genchanges: info: not including original source code in upload dgit ok: source built, results in mason_1.0.0-12.4.dsc and mason_1.0.0-12.4_source.changes mattia@warren ~/tmp.gxs0VLD18C/mason (git)-[dgit/sid] % ls -l .. total 532 drwxr-xr-x 5 mattia mattia 4096 Oct 10 13:55 mason -rw-r--r-- 1 mattia mattia 27602 Sep 24 11:51 mason_1.0.0-12.4.diff.gz -rw-r--r-- 1 mattia mattia 1646 Sep 24 11:51 mason_1.0.0-12.4.dsc -rw-r--r-- 1 mattia mattia 506940 Jul 2 2002 mason_1.0.0.orig.tar.gz mattia@warren ~/tmp.gxs0VLD18C/mason (git)-[dgit/sid] % dgit -wc --include-dirty build-source dpkg-source: warning: no source format specified in debian/source/format, see dpkg-source(1) dpkg-source: info: using source format '1.0' dpkg-source: warning: source directory 'mason' is not <sourcepackage>-<upstreamversion> 'mason-1.0.0' dpkg-source: warning: .orig directory name mason.orig is not <package>-<upstreamversion> (wanted mason-1.0.0.orig) dpkg-source: info: building mason using existing mason_1.0.0.orig.tar.gz dpkg-source: info: building mason in mason_1.0.0-12.4.diff.gz dpkg-source: warning: the diff modifies the following upstream files: Makefile baserules.sample firewall mason mason-decide mason-gui-text mason-gui-text.1 mason.1 masonlib masonrc samlib ttt dpkg-source: info: use the '3.0 (quilt)' format to have separate and documented changes to upstream files, see dpkg-source(1) dpkg-source: info: building mason in mason_1.0.0-12.4.dsc changelog will contain changes since 1.0.0-12.4 dpkg-genchanges: warning: 'since' option specifies most recent version '1.0.0-12.4', ignoring dpkg-genchanges: info: not including original source code in upload dgit ok: source built, results in mason_1.0.0-12.4.dsc and mason_1.0.0-12.4_source.changes mattia@warren ~/tmp.gxs0VLD18C/mason (git)-[dgit/sid] % ls -l .. total 4 drwxr-xr-x 5 mattia mattia 4096 Oct 10 13:55 mason mattia@warren ~/tmp.gxs0VLD18C/mason (git)-[dgit/sid] % Here you see that the first run without --include-dirty doesn't do anything scary, the second run with --include-dirty (which should be a no-op, given that no changes happened on the git repository, it's as pristine as it can get), deletes all the sources from `..`!!! -- regards, Mattia Rizzolo GPG Key: 66AE 2B4A FCCF 3F52 DA18 4D18 4B04 3FCD B944 4540 .''`. more about me: https://mapreri.org : :' : Launchpad user: https://launchpad.net/~mapreri `. `'` Debian QA page: https://qa.debian.org/developer.php?login=mattia `-
signature.asc
Description: PGP signature
