Package: git-debpush
Version: 13.9
Severity: wishlist

For -backports uploads, I normally prefer to retain only the backports-specific changelog entry for the most recent round of backports, in order to avoid cluttering the changelog with lots of entries that just say "Rebuild for bookworm-backports". I accept that this may be a personal quirk, but https://backports.debian.org/Contribute/#index3h2 seems to at least suggest it, and I don't think it's terribly unusual.

However, this caused git-debpush to fail with "error: missing field Version in parsed changelog". I retried with "dgit -v0.11.1 push-source" and that worked fine, but git-debpush seems to have no equivalent option. Perhaps one could be added?

Thanks,

--
Colin Watson (he/him)                              [cjwat...@debian.org]
--- Begin Message ---
job id: 312
url: https://salsa.debian.org/freexian-team/debusine.git
tag: debian/0.11.3_bpo12+1
preparing
tag signature verified
tag parsed ok
source: debusine
version: 0.11.3~bpo12+1
tag signer authorised for package
source code fetched
changelog parsed ok
target: debian bookworm-backports
no upstream tag/commit specified, not considering orig(s)
processing failed with error exit status 255
oracle$ dgit --version
dgit version git:404893db0674ae2c85f6b0574bc4fb4595c2ba02
# builder: oracle$ ./ssh-builder 
'tag2upload-buil...@tag2upload-builder-01.debian.org' ...
builder$ dgit --version
dgit version 13.9

builder:work$ git fetch origin --no-tags 
'refs/tags/debian/0.11.3_bpo12+1:refs/tags/debian/0.11.3_bpo12+1'
>From https://salsa.debian.org/freexian-team/debusine
 * [new tag]           debian/0.11.3_bpo12+1 -> debian/0.11.3_bpo12+1
# [ok]

builder:work$ git checkout -q 'refs/tags/debian/0.11.3_bpo12+1'
# [ok]
# source code fetched
# changelog parsed ok
# target: debian bookworm-backports
# no upstream tag/commit specified, not considering orig(s)

oracle$ dgit -wn -pdebusine --build-products-dir=../bpd 
--force-uploading-source-only --ssh=./ssh-builder --dgit=dgit 
-k374D8CE4DB96E9CBD4C0972A606D084E4683C079 --dput:-u --package=debusine 
--expect-suite=bookworm-backports '--expect-version=0.11.3~bpo12+1' 
--tag2upload-builder-mode --split-view=always --new --trust-changelog 
'--t2u-control-add=Git-Tag-Tagger=Colin Watson <cjwat...@debian.org>' 
'--t2u-control-add=Git-Tag-Info=tag=4c9a56de3c13dcca2015c888849cb672c4583fde 
fp=ac0a4ff12611b6fccf01c111393587d97d86500b' rpush-source 
'tag2upload-buil...@tag2upload-builder-01.debian.org:/tmp/autopkgtest-virt-docker.shared.8a1jh06_/downtmp/work'

canonical suite name is bookworm-backports
dpkg-source: warning: --include-removal is not a valid option for 
Dpkg::Source::Package::V3::Native
dpkg-source: warning: --no-preparation is not a valid option for 
Dpkg::Source::Package::V3::Native
dpkg-source: info: using options from work/debian/source/options: 
--extend-diff-ignore=^[^/]*[.]egg-info/ --tar-ignore=.coverage 
--tar-ignore=.mypy_cache --tar-ignore=.tox --tar-ignore=build 
--tar-ignore=docs/_build
dpkg-source: info: using source format '3.0 (native)'
dpkg-source: info: building debusine in debusine_0.11.3~bpo12+1.tar.xz
dpkg-source: info: building debusine in debusine_0.11.3~bpo12+1.dsc
changelog will contain changes since 0.11.1~bpo12+1
>> Copying debian/0.11.3_bpo12+1 to depth 1
>From 
>file:///tmp/autopkgtest-virt-docker.shared.8a1jh06_/downtmp/work/.git/dgit/unpack/work
 * [new tag]         debian/0.11.3_bpo12+1 -> debian/0.11.3_bpo12+1
>> Re-packing ... packed 0 objects not required for --audit
>> Starting compression ... done
>> Appending 'debusine_0.11.3~bpo12+1.git.tar.xz devel optional' to debian/files
dpkg-genchanges: warning: 'since' option specifies non-existing version 
'0.11.1~bpo12+1'
dpkg-genchanges: warning: use newest entry that is earlier than the one 
specified
dpkg-genchanges: warning: package python3-debusine in control file but not in 
files list
dpkg-genchanges: warning: package python3-debusine-server in control file but 
not in files list
dpkg-genchanges: warning: package python3-debusine-signing in control file but 
not in files list
dpkg-genchanges: warning: package debusine-server in control file but not in 
files list
dpkg-genchanges: warning: package debusine-client in control file but not in 
files list
dpkg-genchanges: warning: package debusine-worker in control file but not in 
files list
dpkg-genchanges: warning: package debusine-signing in control file but not in 
files list
dpkg-genchanges: warning: package debusine-doc in control file but not in files 
list
dpkg-genchanges: info: including full source code in upload
last upload to archive: specified git info (debian)
Checking package changelog for archive version 0.11.1~bpo12+1 ...
dpkg-parsechangelog: warning: 'from' option specifies non-existing version 
'0.11.1~bpo12+1'
dpkg-parsechangelog: warning: use oldest entry that is later than the one 
specified
dpkg-parsechangelog: warning: 'to' option specifies non-existing version 
'0.11.1~bpo12+1'
dpkg-parsechangelog: warning: use newest entry that is earlier than the one 
specified

dgit (build host): error: dgit (build host): error: missing field Version in 
parsed changelog
dgit (build host): Perhaps debian/changelog does not mention 0.11.1~bpo12+1 ?
dgit: failed command: ./ssh-builder 
'tag2upload-buil...@tag2upload-builder-01.debian.org' 'dgit -wn -pdebusine 
--build-products-dir=../bpd --force-uploading-source-only --ssh=./ssh-builder 
--dgit=dgit -k374D8CE4DB96E9CBD4C0972A606D084E4683C079 --dput:-u 
--package=debusine --expect-suite=bookworm-backports 
'\''--expect-version=0.11.3~bpo12+1'\'' --tag2upload-builder-mode 
--split-view=always --new --overwrite 
'\''--t2u-control-add=Git-Tag-Tagger=Colin Watson <cjwat...@debian.org>'\'' 
'\''--t2u-control-add=Git-Tag-Info=tag=4c9a56de3c13dcca2015c888849cb672c4583fde 
fp=ac0a4ff12611b6fccf01c111393587d97d86500b'\'' remote-push-source-build-host 2 
/tmp/autopkgtest-virt-docker.shared.8a1jh06_/downtmp/work '\''7,6,5,4'\'''

dgit: error: subprocess failed with error exit status 253
! Push failed, while preparing your push.
! You can retry the push, after fixing the problem, if you like.
t2u processor [dgit-repos-server]: failed command: dgit -wn -pdebusine 
--build-products-dir=../bpd --force-uploading-source-only --ssh=./ssh-builder 
--dgit=dgit -k374D8CE4DB96E9CBD4C0972A606D084E4683C079 --dput:-u 
--package=debusine --expect-suite=bookworm-backports 
'--expect-version=0.11.3~bpo12+1' --tag2upload-builder-mode --split-view=always 
--new --trust-changelog '--t2u-control-add=Git-Tag-Tagger=Colin Watson 
<cjwat...@debian.org>' 
'--t2u-control-add=Git-Tag-Info=tag=4c9a56de3c13dcca2015c888849cb672c4583fde 
fp=ac0a4ff12611b6fccf01c111393587d97d86500b' rpush-source 
'tag2upload-buil...@tag2upload-builder-01.debian.org:/tmp/autopkgtest-virt-docker.shared.8a1jh06_/downtmp/work'

t2u processor [dgit-repos-server]: error: subprocess failed with error exit 
status 255
object a20f867f56e7928fd80de2eab1caedf3a0242b5b
type commit
tag debian/0.11.3_bpo12+1
tagger Colin Watson <cjwat...@debian.org> 1753014598 +0200

debusine release 0.11.3~bpo12+1 for bookworm-backports

[dgit distro=debian split]
[dgit please-upload source=debusine version=0.11.3~bpo12+1]
-----BEGIN PGP SIGNATURE-----

iQIzBAABCAAdFiEErApP8SYRtvzPAcEROTWH2X2GUAsFAmh84UYACgkQOTWH2X2G
UAt7sxAAiRzEiBh1CCPMouBmuZO1FyqSlt+tCI3PdnSS24YuzMiTHvfREuZJ2K92
tmwOVLI3ZuSr0qXdEzL0mByV2rz7ouFFm57TBE0Yt4zOzyfelAiRSlakLCGSKJfa
aNvv9lBy69CnzNnRYaO7XUf5oJlkfDUr28YBMwqBLCzzKOSaTBam4Fe/z5Lydzc5
F0gvXwugBH7eqe14mI1W4mk7R9wcoyUf8o1N2CrZPdEVTvSLWtiihMogvmLjfr7I
QmEA3gXCnaGP85elrYkd0y190HOI03w2p+cl8ZVut/S+vKoeZ73y0/z550mO4FY4
RK73XvWbk2hQDqgxBPVHpfsTJm/Uuu6PMVYeyLGJnVHsN556dm3JpKzcSeBX80OZ
GRp/aQgXy/M//qK3Cc2DaO/LA2INr1iDL/JFWr6/iGvCJ8TyNM3QQf45L5/sSX11
TXNmkSPWwoyJ3OQS3djmW2kc22m9umiWbi5P2Mij6VnozGaMmYASFJwuC3ifkL4R
XGcDKHrSD2IFCGguMWEFc8Hz1mmJ+ObijIxxLLl6G87ZeqArKk6l4onV6hXNIL5j
Z7He+NrfmEXVhI5YrNV6fjJNwJhBLevJRzzUIj+pC+3qQB6XJ4cf2ZogOMh8MlKE
TvLVxZts3Wi6aV9+gUfFPnDp60p8XjR9tSrPi4KN6XoPmhO7Bhk=
=rUx2
-----END PGP SIGNATURE-----
#!/bin/sh
# ** autogenerated for t2u job 312 **
# by dgit-repos-server tag2upload_hide_builder_rune_in_attachment.
#
# ssh wrapper, embodying runes to to enter builder VM from the builder host.
# See TAG2UPLOAD-DESIGN.txt.

set -e
host="$1"; shift
exec ssh -oBatchMode=yes "$host" 'podman exec -i 
387e0d4006d87f74be9dd03ef0815ed30cab7c38159e7bcb215d792da6d0ac1f env -i bash -c 
'\''set -a; [ -r /etc/environment ] && . /etc/environment 2>/dev/null || true; 
[ -r /etc/default/locale ] && . /etc/default/locale 2>/dev/null || true; [ -r 
/etc/profile ] && . /etc/profile 2>/dev/null || true; set +a;"$@"; RC=$?; [ $RC 
!= 255 ] || RC=253; set -e;myout=$(readlink /proc/$$/fd/1);myerr=$(readlink 
/proc/$$/fd/2);myout="${myout/[/'\'''\\''\\''\'''\'''\\''\\''\''[}"; 
myout="${myout/]/'\'''\\''\\''\'''\'''\\''\\''\'']}";myerr="${myerr/[/'\'''\\''\\''\'''\'''\\''\\''\''[}";
 myerr="${myerr/]/'\'''\\''\\''\'''\'''\\''\\''\'']}";PS=$(ls -l 
/proc/[0-9]*/fd/* 2>/dev/null | sed -nr 
'\'''\\''\'''\'''\'''\\''\\''\''#('\'''\\''\'''\''"$myout"'\'''\\''\'''\''|'\'''\\''\'''\''"$myerr"'\'''\\''\'''\'')#
 { s#^.*/proc/([0-9]+)/.*$#'\'''\\''\\''\''1#; p}'\'''\\''\'''\''|sort 
-u);KILL="";for pid in $PS; do    [ $pid -ne $$ ] && [ $pid -ne $PPID ] || 
continue;    KILL="$KILL $pid";done;[ -z "$KILL" ] || kill -9 $KILL >/dev/null 
2>&1 || true;exit $RC'\'' -- su - builder -- -ec '\''exec "$@";x'\'' --' "$@"

--- End Message ---

Reply via email to