Package: dgit Version: 3.12 Severity: normal Steps to reproduce:
1. Package with single-debian-patch in d/source/options.
2. Diff in d/patches/debian-changes.
3. Merge new upstream version that incorporates the changes in
d/patches/debian-changes, i.e., the patch needs to be dropped.
4. `dgit sbuild` (oddly, `dgit quilt-fixup` thinks it has nothing to do)
Expected outcome:
d/patches/* deleted, and this change committed to git by dgit, as with
other quilt fixups under single-debian-patch.
Actual outcome:
d/patches/* deleted, and the change is not committed, and the build
aborts:
iris ~/src/s-el % dgit quilt-fixup
Format `3.0 (quilt)', need to check/update patch stack
starting quiltify (single-debian-patch)
dpkg-source: info: using options from work/debian/source/options:
--single-debian-patch --auto-commit
dpkg-source: info: using source format '3.0 (quilt)'
dpkg-source: info: building s-el using existing ./s-el_1.12.0.orig.tar.xz
dpkg-source: info: building s-el in s-el_1.12.0-1.debian.tar.xz
dpkg-source: info: building s-el in s-el_1.12.0-1.dsc
dpkg-source: warning: extracting unsigned source package (s-el_1.12.0-1.dsc)
dpkg-source: info: extracting s-el in s-el-1.12.0
dpkg-source: info: unpacking s-el_1.12.0.orig.tar.xz
dpkg-source: info: unpacking s-el_1.12.0-1.debian.tar.xz
nothing quilty to commit, ok.
iris ~/src/s-el % build-for-upload
Format `3.0 (quilt)', need to check/update patch stack
starting quiltify (single-debian-patch)
dpkg-source: info: using options from work/debian/source/options:
--single-debian-patch --auto-commit
dpkg-source: info: using source format '3.0 (quilt)'
dpkg-source: info: building s-el using existing ./s-el_1.12.0.orig.tar.xz
dpkg-source: info: building s-el in s-el_1.12.0-1.debian.tar.xz
dpkg-source: info: building s-el in s-el_1.12.0-1.dsc
dpkg-source: warning: extracting unsigned source package (s-el_1.12.0-1.dsc)
dpkg-source: info: extracting s-el in s-el-1.12.0
dpkg-source: info: unpacking s-el_1.12.0.orig.tar.xz
dpkg-source: info: unpacking s-el_1.12.0-1.debian.tar.xz
nothing quilty to commit, ok.
dpkg-source: info: using options from s-el/debian/source/options:
--single-debian-patch --auto-commit
dpkg-source: info: using source format '3.0 (quilt)'
dpkg-source: info: building s-el using existing ./s-el_1.12.0.orig.tar.xz
dpkg-source: error: cannot read s-el/.pc/applied-patches: No such file or
directory
dgit: failed command: dpkg-source '-i'\\'.git/' -I.git -b -- s-el
dgit: subprocess failed with error exit status 2
-- System Information:
Debian Release: buster/sid
APT prefers testing
APT policy: (900, 'testing'), (100, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 4.12.0-2-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8),
LANGUAGE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
Versions of packages dgit depends on:
ii apt 1.5~rc4
ii ca-certificates 20170717
ii coreutils 8.26-3
ii curl 7.55.1-1
ii devscripts 2.17.10
ii dpkg-dev 1.18.24
ii dput-ng [dput] 1.15
ii git [git-core] 1:2.14.1-3
ii git-buildpackage 0.8.18
ii libdpkg-perl 1.18.24
ii libjson-perl 2.94-1
ii liblist-moreutils-perl 0.416-1+b3
ii libperl5.26 [libdigest-sha-perl] 5.26.0-8
ii libtext-glob-perl 0.10-1
ii libtext-iconv-perl 1.7-5+b6
ii libwww-perl 6.15-2
ii perl 5.26.0-8
Versions of packages dgit recommends:
ii openssh-client [ssh-client] 1:7.5p1-10
Versions of packages dgit suggests:
ii sbuild 0.73.0-4
-- no debconf information
--
Sean Whitton
signature.asc
Description: PGP signature
