We had a trouble report (job 204) and I think the version of dgit was
out of date.  But I'm not sure.

We should change dgit-repos-server to run dgit --version.  This should
be done both on the oracle and inside the container, and both versions
should appear in the report email.

Ian.

Hello,

That sounds like a good idea.  I think if it's running a snapshot we'd
want the git commit.  Maybe somehow using-these could arrange that?

Sean Whitton writes ("Re: Bug#1108242: tag2upload job mails should report the outer and inner dgit versions"):

It probably could, yes.

Also:

I think we want to move all of the orig-handling from d-r-s to
something inside the builder.  That's not something the oracle needs
to concern itself with and doing it in the builder container will make
it easier to update.

I already added a dgit option to do part of the job.  Do you think all
of this should become a new dgit option?

Ian.

Hello,

Definitely, good thought.

How about reusing --tag2upload-builder-mode?
That doesn't take a value atm.

Sean Whitton writes ("Bug#1108242: tag2upload job mails should report the outer and inner dgit versions"):

We could do that.  I was asking less about the precise CLI options,
and more whether this should be a separate script for reasons of
either maintainability (eg, not complicating flow inside dgit's
innards any more than we have to), or user facing neatness.

The main dgit invocation currently has no way to write into the
"summary" part of the t2u report mail.

I'm inclined to suggest a separate script whose stdout goes there and
whose stderr goes into the transcript.

Ian.

Hello,

I don't think I have an opinion on whether or not it should be a
separate script, at least for now.

As discussed in this report, the logic for finding origs is getting
complicated and should move from dgit-repos-server (on oracled) to
something in dgit.deb on the builder, so that we can update it more
easily.

Ian.

This was sorted out in 7ca31233b7b9ddd23cf9deefd8ee5d9f5310273b
and earlier commits.

That commit hasn't been released in a src:dgit upload yet but it has
been deployed on the Oracle and is in service.

Ian.

We believe that the bug you reported is fixed in the latest version of
dgit, which is due to be installed in the Debian FTP archive.

A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 1108658@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Sean Whitton <spwhitton@spwhitton.name> (supplier of updated dgit package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@ftp-master.debian.org)
Format: 1.8
Date: Mon, 28 Jul 2025 13:53:45 +0100
Source: dgit
Architecture: source
Version: 13.10
Distribution: experimental
Urgency: medium
Maintainer: Debian tag2upload Delegates <dgit-owner@debian.org>
Changed-By: Sean Whitton <spwhitton@spwhitton.name>
Closes: 1108658 1109473
Changes:
 dgit (13.10) experimental; urgency=medium
 .
   git-debpush user experience improvements:
   * Print some status messages while processing.
   * Better error messages when git-deborig tag search fails.
   * New --help, -h options.  Closes: #1109473.
 .
   tag2upload infrastructure:
   * Switch to using new tag2upload-obtain-origs script.
     Closes: #1108658.  [Ian Jackson]
   * tag2upload Manager protocol: Introduce some protocol state names.
     [Ian Jackson]
   * tag2upload-oracled: Speak Manager protocol version 5.
   * tag2upload-builder-rebuild: Request restarting workers.
 .
   git-debpush miscellaneous:
   * Expand and update statement of design principles.
   * Delete a completed TODO.
Checksums-Sha1:
 986403f2bb2618768d6d88110cd2331a4009a28d 2615 dgit_13.10.dsc
 0d446e9916449b1e2a817e7181d394ef0f93efc5 771461 dgit_13.10.tar.gz
 04cf21a70d953e54eb647be50fe9ebfe4ce4c20a 971396 dgit_13.10.git.tar.xz
 21275dac2ca5372bc6d55f1b200b8362cde211d7 18032 dgit_13.10_source.buildinfo
Checksums-Sha256:
 af7ca83418c900e52d6b176382353cefe4f7bd4bf4712152773eade24540918a 2615 dgit_13.10.dsc
 5419bf2a7da6119cfc6f5581bf2dc2acff05078784161af763dda05ef7709bfd 771461 dgit_13.10.tar.gz
 dea8119cf03bfc546faa4c8b286e967159cbd02fa50dba0c7e89559287a191ec 971396 dgit_13.10.git.tar.xz
 9225e17a68bfa3d530e1270771ed492dc18ab3828bdec47eeea3eb971a231555 18032 dgit_13.10_source.buildinfo
Files:
 394c9f2e9839f2dc3668522d97b38475 2615 devel optional dgit_13.10.dsc
 53059d524188563638919ddf10e454a2 771461 devel optional dgit_13.10.tar.gz
 22dac0b18e87e55bbe65b10a0036b5d7 971396 devel optional dgit_13.10.git.tar.xz
 0e61c84d77f2fd9f8955fed9ab7289ee 18032 devel optional dgit_13.10_source.buildinfo
Git-Tag-Info: tag=137d9ac9c0250cc60a508859a4ca52a3d798a04b fp=9b917007ae030e36e4fc248b695b7ae4bf066240
Git-Tag-Tagger: Sean Whitton <spwhitton@spwhitton.name>
-----BEGIN PGP SIGNATURE-----

iQIzBAEBCgAdFiEEN02M5NuW6cvUwJcqYG0ITkaDwHkFAmiHeh0ACgkQYG0ITkaD
wHnTdhAAvqFqj3Xkvqitp5agwNGhZ6orXlqgxqnZuZj41HP/7ax+TFFRFkM9t+z2
aWSiI+RcL68XIfaqBwqt5kqnnCuVz7UlxG3OSEbsYKOyOQ9zCFtmGyl8pd4P+Lsq
zHcJddNpSse1PL4n2MM8bcqne4w2KKrGEq7OKTWNf0c6c13UlNLyMw4Qf6aLJ5o8
0B5swOip6Q2tNWGbGLCve6qKzuYEHt6JcEi7l4w05yUIQNpTV6x4HiwStum8pyjo
c//nnfqfiYLgbAktXF9vw8dXDlaXF3Xo7BavjbPcHe5oCbfgrs4akEXDB77nr6DL
BSi/EHQckF1eSCg1yTpCOrlhFTaQTmprAaNOBcDCKJyAWGmIvlhPnaRQ30TLeq13
/pl1Rh+ITvL0f23ZZM4c8cM9r855Imt62P5mNlJUHTopMSxhcNjzsbyfYcwwDDb9
4uDNxlbaHDov7CILKw6kQYbLe2OLjRI3VmPXC+0DTJvqokstMJgCb6GaVSXUX5Cw
+99e2S3HoMJeiS48KDNCapSn2lxQ4OBI5J+DPtQCCfUpe3iAvOVWdzXMWDohxzLb
ZGLAEexuEu1CA8uXdATwUlyQ6GkkbSxnAGS3XqwBz+MyHeR03Nxxf/e8oct5iRyB
aHPsSYisHaowDeN/bV/+HsdRB/JY/xnzjOOuhxaP7ojqDXmGg8c=
=MT1i
-----END PGP SIGNATURE-----

We believe that the bug you reported is fixed in the latest version of
dgit, which is due to be installed in the Debian FTP archive.

A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 1108658@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Ian Jackson <ijackson@chiark.greenend.org.uk> (supplier of updated dgit package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@ftp-master.debian.org)
Format: 1.8
Date: Sun, 10 Aug 2025 20:18:45 +0100
Source: dgit
Architecture: source
Version: 13.11
Distribution: unstable
Urgency: medium
Maintainer: Debian tag2upload Delegates <dgit-owner@debian.org>
Changed-By: Ian Jackson <ijackson@chiark.greenend.org.uk>
Closes: 1107151 1107921 1108088 1108242 1108378 1108613 1108658 1109130 1109473 1110339 1110402
Changes:
 dgit (13.11) unstable; urgency=medium
 .
   * No change upload, targeting mainline to unstable.
 .
 dgit (13.11+exp1) experimental; urgency=medium
 .
   git-debpush UX improvements:
   * Always print a message before fetching from salsa.
     Closes: #1110402.  [Sean Whitton]
   * Detect debian/source/local-options, as a failed check.
     This avoids later failures.  Closes: #1110339.  [Sean Whitton]
   * Detect redundant --quilt mode option, as a failed check.
     Helps useers avoid dangerous habits.  Closes: #1108378.  [Sean Whitton]
   * Detect possible intent to use pristine-tar even if pristine-tar
     is not installed.  [Andrea Pappacoda]
 .
   tag2upload service:
   * If origs cannot be obtained from the archive (eg due to mirror delays),
     try to regenerate them.  Closes: #1109130.  (Deployment TBC.)
 .
   Documentation:
   * Workflow manpages: Replace bookworm with trixie.  [Sean Whitton]
   * Workflow manpages: Suggest sbuild -d, not sbuild -c.  [Sean Whitton]
   * tag2upload(5): Specify ! for service-critical extensions.
 .
   Minor bugfixes:
   * git-debpush: Avoid ignoring a failure of git-cat-file.  [Sean Whitton]
   * Add missing newline to overridden --force fail message.
 .
   dgit download-unfetched-origs subcommand (changes to support tag2upload):
   * Look in the source tree's current suite, specifically.
   * New --write-sha256sums subcommand option.
   * Don't download files already present in the build-products-dir.
   * Save downloaded files to .tmp names until file checksums verified.
   * Report unobtainable origs with special exit status 3.
 .
   Supporting and internal changes:
   * Cleanups and defensiveness in tag2upload-oracled.  [Sean Whitton]
   * Code cleanups, and refactoring, in git-debpush.  [Sean Whitton]
   * Much logic moved from tag2upload-obtain-origs into dgit.
 .
   Tests:
   * Refactoring and additions for testing the new functionality.
   * restore checking of error messages in tag2upload emails.
   * t2u-integration: Include the event_name field in webhook.
     (Compatibility with tag2upload-service-manager changes.)
 .
 dgit (13.10) experimental; urgency=medium
 .
   git-debpush user experience improvements:
   * Print some status messages while processing.
   * Better error messages when git-deborig tag search fails.
   * New --help, -h options.  Closes: #1109473.
 .
   tag2upload infrastructure:
   * Switch to using new tag2upload-obtain-origs script.
     Closes: #1108658.  [Ian Jackson]
   * tag2upload Manager protocol: Introduce some protocol state names.
     [Ian Jackson]
   * tag2upload-oracled: Speak Manager protocol version 5.
   * tag2upload-builder-rebuild: Request restarting workers.
 .
   git-debpush miscellaneous:
   * Expand and update statement of design principles.
   * Delete a completed TODO.
 .
 dgit (13.9) experimental; urgency=medium
 .
   tag2upload infrastructure:
   * Improve and shorten command lines appearing in report emails.
   * Check upstream tag/commit correspondence even when using existing origs.
   * Minor performance improvement for native packages (skip pre-fetch).
 .
   Internal changes:
   * Testing improvements for tag2upload.
   * changelog: Start 13.9
   * Introduce new tag2upload-obtain-origs script.
 .
 dgit (13.8) experimental; urgency=medium
 .
   git-debpush user experience improvements:
   * Check for and handle an existing tag for this version.
   * Try to check our branch against the remote target branch,
     to detect releasing from behind mainline, and avoid push failures.
     Closes: #1107921.
 .
   Internal changes:
   * dgit: Provide abbreviated --t2u-* options, to support log improvements.
   * git-debpush: Improve comment about remote branch.  [Sean Whitton]
   * git-debpush: Coding style cleanups.
   * dir-locals.el: Set fill-column to 78 for all languages.
 .
 dgit (13.7) experimental; urgency=medium
 .
   * Demo upload for talk.
 .
 dgit (13.6) experimental; urgency=medium
 .
   * Demo upload for talk rehearsal.
 .
 dgit (13.5) experimental; urgency=medium
 .
   git-debpush user experience improvements:
   * Check for tag already existing at the remote.  Part of #1107921.
   * Improve error message for tag already existing locally.
   * Check for uncommitted changes in working tree.
     Closes: #1108088.  [Sean Whitton]
 .
   tag2upload service:
   * Properly RFC2047-escape non-ASCII names.  Closes: #1108613.
   * Hide virt runes in a per-invocation ssh wrapper  Closes: #1107151.
   * Print oracle and builder dgit versions in transcript.  Closes: #1108242.
   * d-r-s t2u: Add missing -oBatchMode=yes option to ssh invocation.
 .
   CI and administrivia:
   * CI: Check for missing Signed-off-by.
   * git-debpush: Add missing copyright notice.  [Sean Whitton]
   * Add missing Closes for #1108180 to changelog entry for 12.125.
   * CI: Drop compatibility tests for buster, which is gone from the archive.
 .
   Suppporting changes:
   * git-debpush: Figure out the previous maintainer upload version.
   * dgit: Honour DGIT_VERSION in dgit --version and use it in ./using-these.
   * git-debpush: Reorganisation and tidying.  [Ian Jackson and Sean Whitton]
 .
 dgit (13.4) experimental; urgency=medium
 .
   Documentation:
   * t2u o2m: Describe version 5, with 'restart' message.  [Sean Whitton]
   * t2u FAQ: Clarify that debian/-only repos still need
     upstream source in git.  [Christoph Berg]
   * t2u FAQ: Remove much obsolete material.
 .
   Tests:
   * t2u: Test "tag changed between fetches" path.
   * CI: Check for blocking todos (three or more X's).
 .
   Internals:
   * Avoid blocking-todo markers in a few places in docs and comments.
   * dgit-repos-server: Fix a comment about indistrodir.
   * tests: debpolicy-taintrm: Downgrade a TODO.
Checksums-Sha1:
 9193e59edd3b0c18c8347e09d776d313b66a0eb0 2111 dgit_13.11.dsc
 7f99505fd4f2ce48b05d2c284027558ee183d56b 775411 dgit_13.11.tar.gz
Checksums-Sha256:
 4824f3e9a499a6c7e0699c6f7792f16b0d1105a86bac64644a70b73cf0cacf00 2111 dgit_13.11.dsc
 a1fca8a024897385e6238b0ceef172d4754493071d51ac0def18b17b4ab68bb6 775411 dgit_13.11.tar.gz
Files:
 7966448f18a47e620270ba6888e153d6 2111 devel optional dgit_13.11.dsc
 51e56d2f6a4773ce3cc47156c6e9c0bc 775411 devel optional dgit_13.11.tar.gz
-----BEGIN PGP SIGNATURE-----

iQEzBAEBCgAdFiEEVZrkbC1rbTJl58uh4+M5I0i1DTkFAmiZDtYACgkQ4+M5I0i1
DTmhdQf/VUwTc+1xg3POYk6Nn7ai83HGt+Gc36FCeQLp8qjNgQ3lCtS2pcsVBcmE
VS9/Feh6q5o9jpbMob/TBKaH6VdyNs0koEEi2VDC9ELi7KVZkPgQlsiq31IAMN6B
00gQ9ZJzs0A5Gfy0dAFUXBNE8EGHufhq3Ee87aFmvgLSipo8r6I+GJC1u+5cBoSr
TV7SsBAwyNjy+nIYbg3rCU2cYjI8vSGNySrwnXTyKrJ8HnCY9nC+DGSBrgWWvqg3
Sj58Ny3MIqkoH6d/bapwpawcdK5kowv3ToDvUhSH1Ix4nQCCpvTRcdOlp2EnHVrZ
3OVU4lUcKy3AKooeP1QU8uaAd1RYGw==
=du5z
-----END PGP SIGNATURE-----