Package: dgit Version: 9.13 Severity: normal X-Debbugs-Cc: mver...@wikimedia.org
Hi, I have a gbp package where the only patch is a mode change (i.e. no textual change to the contents of files). The first time you do dgit --gbp sbuild it works fine, the second time (having made not changes) it explodes - output below. If you do "gbp pq switch ; gbp pq export --commit" (which doesn't result in a new commit) you can then build successfully again. I'm reporting this against dgit, because you can do gbp buildpackage --git-builder=sbuild repeatedly just fine, it's only dgit that fails. matthew@tsk:~/rclone-build-deps/golang-github-colinmarc-hdfs$ dgit -D --gbp sbuild | git rev-parse --show-toplevel => `/home/matthew/rclone-build-deps/golang-github-colinmarc-hdfs' | git config -z --get-regexp --local '.*' | git config -z --get-regexp --local '.*' | git config -z --get-regexp --global '.*' | git config -z --get-regexp --system '.*' format 3.0 (quilt), quilt mode gbp Format `3.0 (quilt)', need to check/update patch stack | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header => `' + git diff --quiet HEAD format 3.0 (quilt), quilt mode gbp | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header => `' + git diff --quiet HEAD | git clean -dn => `' checking for vendor-specific debian/patches/debian.series (Dpkg::Vendor `current vendor') checking for vendor-specific debian/patches/debian.series ((base) distro being accessed) checking for vendor-specific debian/patches/debian.series ((nominal) distro being accessed) | git rev-parse 'HEAD~0' => `ad62525ee587c1f9e6ad328de8a966bf6b23cecc' | git symbolic-ref -q HEAD => `refs/heads/debian/sid' CD /home/matthew/rclone-build-deps/golang-github-colinmarc-hdfs/.git/dgit/unpack QF linkorigs golang-github-colinmarc-hdfs_2.3.0.orig.tar.gz, /home/matthew/rclone-build-deps/golang-github-colinmarc-hdfs/../golang-github-colinmarc-hdfs_2.3.0.orig.tar.gz Y + env GZIP=-1n tar -zcf './golang-github-colinmarc-hdfs_2.3.0-~~DGITFAKE.debian.tar.gz' -C /home/matthew/rclone-build-deps/golang-github-colinmarc-hdfs debian/source/format debian/rules debian/control debian/changelog debian/patches gzip: warning: GZIP environment variable is deprecated; use an alias or script dgit: split brain (separate dgit view) may be needed (--quilt=gbp). splitbrain cachekey dgit 9.13 2.3.0 gbp ad62525ee587c1f9e6ad328de8a966bf6b23cecc - f0325dc30f6a056fea4b7188cc6b8a972bb0a13f0f64d7fedd2bd174a76f6eac 30dc6999e026677aeede959ceaf8aeec8001c9643c895d37fbdf34c547b7efde |(probably) git log -g '--pretty=format:%H %gs' refs/dgit-intern/quilt-cache CD work + env PATH=/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.32.1:/usr/local/share/perl/5.32.1:/usr/lib/x86_64-linux-gnu/perl5/5.32:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.32:/usr/share/perl/5.32:/usr/local/lib/site_perl:/usr/share/dgit:/home/matthew/bin:/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games git playtree-setup . + git reset -q --hard ad62525ee587c1f9e6ad328de8a966bf6b23cecc dgit view: found cached (commit id b5730dff7e4ceadc1af97199b5ede80df556f4e8) + git checkout -q -b dgit-view b5730dff7e4ceadc1af97199b5ede80df556f4e8 CD /home/matthew/rclone-build-deps/golang-github-colinmarc-hdfs | git rev-parse 'HEAD~0' => `ad62525ee587c1f9e6ad328de8a966bf6b23cecc' CD /home/matthew/rclone-build-deps/golang-github-colinmarc-hdfs/.git/dgit/unpack + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work dpkg-source: info: using source format '3.0 (quilt)' dpkg-source: warning: diff 'work/debian/patches/0001-Remove-executable-bit-from-a-couple-of-source-files.patch' doesn't contain any patch dpkg-source: info: using patch list from debian/patches/series dpkg-source: info: applying 0001-Remove-executable-bit-from-a-couple-of-source-files.patch dpkg-source: warning: diff 'work/debian/patches/0001-Remove-executable-bit-from-a-couple-of-source-files.patch' doesn't contain any patch dpkg-source: info: applying auto-gitignore patching file .gitignore Reversed (or previously applied) patch detected! Skipping patch. 1 out of 1 hunk ignored dpkg-source: info: the patch has fuzz which is not allowed, or is malformed dpkg-source: info: if patch 'auto-gitignore' is correctly applied by quilt, use 'quilt refresh' to update it dpkg-source: error: LC_ALL=C patch -t -F 0 -N -p1 -u -V never -E -b -B .pc/auto-gitignore/ --reject-file=- < work/debian/patches/auto-gitignore subprocess returned exit status 1 dgit: failed command: dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work dgit: error: subprocess failed with error exit status 2 You can reproduce this by cloning https://salsa.debian.org/go-team/packages/golang-github-colinmarc-hdfs [at least ad62525 ] and doing dgit --gbp sbuild #works OK then dgit --gbp sbuild #fails Thanks, Matthew -- System Information: Debian Release: 11.5 APT prefers stable-security APT policy: (500, 'stable-security'), (500, 'stable') Architecture: amd64 (x86_64) Kernel: Linux 5.10.0-7-amd64 (SMP w/16 CPU threads) Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8), LANGUAGE=en_GB:en Shell: /bin/sh linked to /usr/bin/dash Init: sysvinit (via /sbin/init) LSM: AppArmor: enabled Versions of packages dgit depends on: ii apt 2.2.4 ii ca-certificates 20210119 ii coreutils 8.32-4+b1 ii curl 7.74.0-1.3+deb11u3 ii devscripts 2.21.3+deb11u1 ii dpkg-dev 1.20.12 ii dput 1.1.0 ii git [git-core] 1:2.30.2-1 ii git-buildpackage 0.9.22 ii libdpkg-perl 1.20.12 ii libjson-perl 4.03000-1 ii liblist-moreutils-perl 0.430-2 ii liblocale-gettext-perl 1.07-4+b1 ii libtext-csv-perl 2.00-1 ii libtext-glob-perl 0.11-1 ii libtext-iconv-perl 1.7-7+b1 ii libwww-curl-perl 4.17-7+b1 ii perl [libdigest-sha-perl] 5.32.1-4+deb11u2 Versions of packages dgit recommends: ii distro-info-data 0.51+deb11u2 ii liburi-perl 5.08-1 ii openssh-client [ssh-client] 1:8.4p1-5+deb11u1 Versions of packages dgit suggests: ii cowbuilder 0.89 ii pbuilder 0.231 ii sbuild 0.81.2+deb11u1 -- no debconf information
