Package: git-debpush
Version: 15.10
Severity: normal
If one uses `git debpush --gbp` for a tree where dgit can already detect
that the package uses gbp-pq(1) patches (I think by looking at the last
tag in the history?), then the tool complains at you that the option was
superfluous. A comment indicates that this is to get people into the
habit of just typing `git debpush` for their regular uploads.
However, if one is obediently in that habit, then uploads can fail as
shown in the forwarded email. The previous upload of pydantic
(2.13.4-1) had no patches and so dgit did not require any kind of
--quilt argument. 2.13.4-2 added patches. I used `git debpush`, which
appeared completely happy on the client side, but resulted in a failure
from tag2upload.
Right now, it is in practice safer for users who know that their package
either uses gbp-pq(1) now or would use it if it had any patches (due to
team policy or whatever) to always use `git debpush --gbp` and ignore
the warning. It seems that that isn't what you want, though, so I think
`git debpush` needs to detect the situation where the previous tag had
no quilt mode but the current tag requires one.
Thanks,
--
Colin Watson (he/him) [[email protected]]
--- Begin Message ---
job id: 4926
url: https://salsa.debian.org/python-team/packages/pydantic.git
tag: debian/2.13.4-2
preparing
tag signature verified
tag parsed ok
source: pydantic
version: 2.13.4-2
tag signer authorised for package
source code fetched
changelog parsed ok
target: debian unstable
using existing orig(s)
processing failed with error exit status 255
oracle$ dgit --version
dgit version 15.10~bpo13+1
# builder: oracle$ ./ssh-builder
'[email protected]' ...
builder$ dgit --version
dgit version 15.10
builder$ dpkg-source --version
Debian dpkg-source version 1.23.7.
...
builder:work$ tag2upload-fetch-inputs tag=debian/2.13.4-2
upstream_tag=upstream/2.13.4
+ git fetch origin --no-tags
refs/tags/debian/2.13.4-2:refs/tags/debian/2.13.4-2
refs/tags/upstream/2.13.4:refs/tags/upstream/2.13.4
>From https://salsa.debian.org/python-team/packages/pydantic
* [new tag] debian/2.13.4-2 -> debian/2.13.4-2
* [new tag] upstream/2.13.4 -> upstream/2.13.4
builder:work$ git checkout -q refs/tags/debian/2.13.4-2
# [ok]
# source code fetched
# changelog parsed ok
# target: debian unstable
builder:work$ tag2upload-obtain-origs p=pydantic v=2.13.4-2 s=unstable
u=201d1d7effb618748f66984e55293b5948c4a740
+ dgit --build-products-dir=../bpd -ppydantic download-unfetched-origs
--write-sha256sums=.git/dgit/t2uoo/origs.sha256sums
canonical suite name for unstable is sid
suite has origs for this upstream version
downloading pydantic_2.13.4.orig.tar.gz...
# using existing orig(s)
oracle$ dgit -wn -ppydantic --build-products-dir=../bpd
--force-uploading-source-only --quilt=linear --ssh=./ssh-builder --dgit=dgit
-k374D8CE4DB96E9CBD4C0972A606D084E4683C079 --dput:-u --package=pydantic
--expect-suite=unstable --expect-version=2.13.4-2 --tag2upload-builder-mode
--split-view=always --new --trust-changelog --t2u-upstream=upstream/2.13.4
--t2u-upstream-commit=201d1d7effb618748f66984e55293b5948c4a740
'--t2u-control-add=Git-Tag-Tagger=Colin Watson <[email protected]>'
'--t2u-control-add=Git-Tag-Info=tag=67e7d639cce2c11fecc828d1237c237add1608b9
fp=ac0a4ff12611b6fccf01c111393587d97d86500b' rpush-source
'[email protected]:/srv/builder.tag2upload.debian.org/tmp/autopkgtest-virt-docker.shared.k2jta75f/downtmp/work'
Format `3.0 (quilt)', need to check/update patch stack
canonical suite name for unstable is sid
dgit: split brain (separate dgit view) may be needed (--quilt=linear).
examining quilt state (multiple patches, linear mode)
dgit (build host): base trees orig=5cd29f16fa53a4566166
o+d/p=01b068e05b1e3a58d7c6
dgit (build host): quilt differences: src: == orig ## gitignores: == orig
==
dgit (build host): quilt differences: HEAD ## o+d/p HEAD ==
o+d/p
starting quiltify (multiple patches, linear mode)
dgit (build host): error: quilt fixup cannot be linear. Stopped at:
dgit (build host): e1d18e2b..cfb05e1d: changed
debian/patches/pytest-9.1-1.patch,debian/patches/pytest-9.1-2.patch,debian/patches/series
dgit (build host): This might be a patches-unapplied branch.
dgit (build host): Maybe you need one of --[quilt=]gbp --[quilt=]dpm
--quilt=unapplied ?
dgit (build host): Maybe orig tarball(s) are not identical to git
representation?
dgit (build host): error: quilt history linearisation failed. Search `quilt
fixup' in dgit(7).
dgit (build host):
dgit: failed command: ./ssh-builder
'[email protected]' 'dgit -wn -ppydantic
--build-products-dir=../bpd --force-uploading-source-only --quilt=linear
--ssh=./ssh-builder --dgit=dgit -k374D8CE4DB96E9CBD4C0972A606D084E4683C079
--dput:-u --package=pydantic --expect-suite=unstable --expect-version=2.13.4-2
--tag2upload-builder-mode --batch --split-view=always --new --overwrite
--t2u-upstream=upstream/2.13.4
--t2u-upstream-commit=201d1d7effb618748f66984e55293b5948c4a740
'\''--t2u-control-add=Git-Tag-Tagger=Colin Watson <[email protected]>'\''
'\''--t2u-control-add=Git-Tag-Info=tag=67e7d639cce2c11fecc828d1237c237add1608b9
fp=ac0a4ff12611b6fccf01c111393587d97d86500b'\'' remote-push-source-build-host 2
/srv/builder.tag2upload.debian.org/tmp/autopkgtest-virt-docker.shared.k2jta75f/downtmp/work
'\''7,6,5,4'\'''
dgit: error: subprocess failed with error exit status 253
! Push failed, before we got started.
t2u processor [dgit-repos-server]: failed command: dgit -wn -ppydantic
--build-products-dir=../bpd --force-uploading-source-only --quilt=linear
--ssh=./ssh-builder --dgit=dgit -k374D8CE4DB96E9CBD4C0972A606D084E4683C079
--dput:-u --package=pydantic --expect-suite=unstable --expect-version=2.13.4-2
--tag2upload-builder-mode --split-view=always --new --trust-changelog
--t2u-upstream=upstream/2.13.4
--t2u-upstream-commit=201d1d7effb618748f66984e55293b5948c4a740
'--t2u-control-add=Git-Tag-Tagger=Colin Watson <[email protected]>'
'--t2u-control-add=Git-Tag-Info=tag=67e7d639cce2c11fecc828d1237c237add1608b9
fp=ac0a4ff12611b6fccf01c111393587d97d86500b' rpush-source
'[email protected]:/srv/builder.tag2upload.debian.org/tmp/autopkgtest-virt-docker.shared.k2jta75f/downtmp/work'
t2u processor [dgit-repos-server]: error: subprocess failed with error exit
status 255
object 979730fe3c9310d01de713750e3cf85e5403d5d0
type commit
tag debian/2.13.4-2
tagger Colin Watson <[email protected]> 1782659532 +0100
pydantic release 2.13.4-2 for unstable
[dgit please-upload source=pydantic version=2.13.4-2]
[dgit distro=debian split --quilt=linear]
[dgit upstream-tag=upstream/2.13.4
upstream=201d1d7effb618748f66984e55293b5948c4a740]
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEErApP8SYRtvzPAcEROTWH2X2GUAsFAmpBOcwACgkQOTWH2X2G
UAud+xAAs2vzcUHa5ENnzRtE1nZbVyEmbdbSVMHMo0Hi7xfhT/70OFikmJc6sM89
h1l28YAY2nFyYWToNCJ69L8eanKmrO8ECydecDZAowBeA5CMdJqtGV3Hiu/wu3CV
wobGvFPODZlIYdqFVb4IVYzUNtgxPCXl4T6e7hy2Sw2xKrQHjiPOUkOqdCAv9wOu
kl4fbubl3M94YJJyfqb4Bq3/xecrba+KWnFbinbPB+y/PlkBZRwv5d1unQ6fP6Vq
7RS8/XEw9KN9tfyupBKhepgcLHElxflwG7m7p47vC6OQTQMgL8dxMAL7TLknmhYT
AZE7vcdfDCWIDXxInoYfc7sMT+DnaqXEjeLc3/Sx3fkigRJSFJyF90lMZA4rwdzc
wdl41oXDrPt26d+EZS1+raXZt1/ictd6ucY8Q7YNmAjSHkZIQcKV6YDMMjt+BLuL
+iGCNb9m67IAfwiyUj3+ggJnAMEatcJEdyZSQPMW2GiwpFPTRrY7fZhU205e5/mr
TLLo/nj0DiQk8BKyrSwzq8NSVHkUeY+V529ATJByIoVchKVVIGULPTZRFsagnJoD
Dv7hxZtMWQkaMS/MEnIfFleuyXQ31e3Nt4WqvyhrNIHfJlj6O+oiI2oz1+TbfF20
E2XO3CHszSiI23l8Oqu3R+EbVH0F4BRiYXBSpFpg45rRo8uGQGs=
=shik
-----END PGP SIGNATURE-----
#!/bin/sh
# ** autogenerated for t2u job 4926 **
# 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
export GIT_SSH_COMMAND='ssh -oBatchMode=yes -oConnectTimeout=30
-oServerAliveInterval=120 -oServerAliveCountMax=8 -oConnectionAttempts=10'
host="$1"; shift
exec ssh -oBatchMode=yes "$host" 'podman exec -i
4131c5464bb3a1b6ccb5f7146376ac9214da6b69141e898f7326d5ed4ebdb75f 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 ---
