diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2018-07-25 21:05:28 +0800 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-07-26 04:56:35 +0100 |
| commit | 599ee8fbfde3786781d36944caac72353aee99e3 (patch) | |
| tree | b4e9e38b3edc5231d6161c8735038bd2c8d40593 | |
| parent | 8f6bfa045b93231a81821ef49222168b223d31e2 (diff) | |
dgit: make $need_split_build_invocation always true
dgit will always build the source package.
One minor consequence is that dgit will usualliy generate
*_multi.changes rather than *_$arch.changes, so we need to update the
one test that makes the contrary assumption.
Bump the dgit major version number as this is quite a significant
change in implementation and also a behavioural change.
This change makes a lot of code dead. Removing that is left as a task
for the future.
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| -rw-r--r-- | debian/changelog | 5 | ||||
| -rwxr-xr-x | dgit | 2 | ||||
| -rwxr-xr-x | tests/tests/push-source-with-changes | 4 |
3 files changed, 6 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog index d936d22..f0b6919 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dgit (5.11~) unstable; urgency=medium +dgit (6.0~) unstable; urgency=medium * test suite: unset VISUAL, which interferes. Closes:#904308. * apt-get method: when apt does not update release files, @@ -11,6 +11,9 @@ dgit (5.11~) unstable; urgency=medium * dgit: Minor internal improvements. * dgit: Rename --ignore-dirty to --include-dirty (leaving the old name supported as a deprecated alias). + * dgit: Always build the source package ourselves, rather than + sometimes leaving that to the builder command. dgit will now + usually generate *_multi.changes rather than *_$arch.changes. -- @@ -166,7 +166,7 @@ our $keyid; autoflush STDOUT 1; our $supplementary_message = ''; -our $need_split_build_invocation = 0; +our $need_split_build_invocation = 1; our $split_brain = 0; END { diff --git a/tests/tests/push-source-with-changes b/tests/tests/push-source-with-changes index b9a3906..580ea3a 100755 --- a/tests/tests/push-source-with-changes +++ b/tests/tests/push-source-with-changes @@ -2,8 +2,6 @@ set -e . tests/lib -arch=$(dpkg-architecture -qDEB_BUILD_ARCH) - t-tstunt-parsechangelog t-prep-newpackage example 1.0 @@ -18,7 +16,7 @@ t-ref-head t-dgit --dpkg-buildpackage:-d build -F t-expect-push-fail 'user-specified changes file is not source-only' \ -t-dgit -C ../${p}_1.0_${arch}.changes push-source --new +t-dgit -C ../${p}_1.0_multi.changes push-source --new # (2) try pushing a source-only changes file |