On Tue, Oct 09, 2018 at 11:44:34PM +0100, Ian Jackson wrote: > I think this diff will fix it. You can apply it directly with patch > to dgit in your /usr/bin if you like.
Right, with your patch I see it's not crashing anymore.
However I also see that:
* without --include-dirty, it's completely ignoring the added
d/source/format file
* with --iclude-dirty is giving up with
error: tree contains uncommitted files and --clean=check specified
* without -wc and with --include-dirty, it tries to its quilt
linearisation, but it fails with:
mattia@warren ~/devel/debian/QA/mason/mason (git)-[remotes/dgit/dgit/sid] %
dgit --include-dirty build-source
dpkg-buildpackage: info: source package mason
dpkg-buildpackage: info: source version 1.0.0-12.4
dpkg-buildpackage: info: source distribution unstable
dpkg-buildpackage: info: source changed by Mattia Rizzolo <mat...@debian.org>
fakeroot debian/rules clean
dh_testdir
dh_testroot
rm -f build-stamp install-stamp
debconf-updatepo
# Add here commands to clean up after the build process.
#-/usr/bin/make clean
dh_clean
dh_clean: Compatibility levels before 9 are deprecated (level 5 in use)
Format `3.0 (quilt)', need to check/update patch stack
examining quilt state (multiple patches, linear mode)
gzip: warning: GZIP environment variable is deprecated; use an alias or script
dgit: base trees orig=5df2f64c4d67150c7768 o+d/p=5df2f64c4d67150c7768
dgit: quilt differences: src: ## orig == gitignores: == orig ==
dgit: quilt differences: HEAD ## o+d/p HEAD == o+d/p
starting quiltify (multiple patches, linear mode)
quiltify linearisation planning successful, executing...
dpkg-source: warning: --include-removal is not a valid option for
Dpkg::Source::Package::V1
dpkg-source: info: 'dpkg-source --commit' is not supported by the source format
'1.0'
nothing quilty to commit, ok.
dpkg-source: info: using source format '3.0 (quilt)'
dpkg-source: info: building mason using existing ./mason_1.0.0.orig.tar.gz
dpkg-source: info: local changes detected, the modified files are:
mason/Makefile
mason/baserules.sample
mason/firewall
mason/mason
mason/mason-decide
mason/mason-gui-text
mason/mason-gui-text.1
mason/mason.1
mason/masonlib
mason/masonrc
mason/samlib
mason/ttt
dpkg-source: info: you can integrate the local changes with dpkg-source --commit
dpkg-source: error: aborting due to unexpected upstream changes, see
/tmp/mason_1.0.0-12.4.diff.EP2mGJ
dgit: failed command: dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- mason
dgit: error: subprocess failed with error exit status 2
I'm not sure if I'm doing something in a way I'm not supposed to do
here.
Note that I already worked around this bug yesterday by manually calling
dpkg-source --commit and git commit the resulting quilt patch, at which
point dgit goes back behaving the way I know it.
> I will make a release with the fix RSN.
I don't think there is a need to rush out a release just for this :)
--
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
