Your message dated Thu, 29 Dec 2022 01:19:10 +0000
with message-id <[email protected]>
and subject line Bug#993769: fixed in dgit 10.3
has caused the Debian Bug report #993769,
regarding dgit: dpkg-source "duplicate files" error could be made more helpful
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)


-- 
993769: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=993769
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: dgit
Version: 9.13
Severity: wishlist

Hi Ian,

While switching to dgit, I tried the recommended 'dgit build-source' (as in the
dgit-maint-debrebase manual) only to be presented with this:

=-=-=-
  Format `3.0 (quilt)', need to check/update patch stack
  examining quilt state (multiple patches, linear mode)
  dgit: found orig(s) in .. missing from build-products-dir, transferring:
  dgit: hardlinked orig from ..: openqa_4.6.1618324929.5c4cb4a68.orig.tar.xz
  gzip: warning: GZIP environment variable is deprecated; use an alias or script
  dpkg-source: error: duplicate files in v2.0 source package: 
openqa_4.6.1618324929.5c4cb4a68.orig.tar.*
  dgit: failed command: sh -ec 'exec dpkg-source --no-check --skip-patches -x 
fake.dsc >/dev/null'

  dgit: error: subprocess failed with error exit status 255
=-=-=-

The "files in v2.0 source package" bit here initially lead me to assume that
there were somehow duplicated files in the tarball, whereas what its actually
trying to say is that I had two orig tarballs, when only one is allowed.

What was actually going on was that in my build-products-dir (~/build-area in my
case) there already existed a openqa_4.6.1618324929.5c4cb4a68.orig.tar.gz file,
whereas it seems that at some point I'd managed to have that produced as
openqa_4.6.1618324929.5c4cb4a68.orig.tar.xz in the directory above the source.

dgit, noticing the lack of an .xz file and hardlinked it into ~/build-area, at
which point there are two copies of the tarball, and dpkg-source gets upset.

I guess that dgit should check for such duplication before doing the hardlink,
and bail out with a more helpful message at that point.

HTH

Cheers, Phil.

-- System Information:
Debian Release: 11.0
  APT prefers stable-security
  APT policy: (500, 'stable-security'), (500, 'stable'), (500, 'oldstable'), 
(99, 'unstable')
Architecture: amd64 (x86_64)

Kernel: Linux 5.10.0-7-amd64 (SMP w/4 CPU threads)
Kernel taint flags: TAINT_OOT_MODULE, TAINT_UNSIGNED_MODULE
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_GB:en
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled

Versions of packages dgit depends on:
ii  apt                        2.2.4
ii  ca-certificates            20210119
ii  coreutils                  8.32-4+b1
ii  curl                       7.74.0-1.3+b1
ii  devscripts                 2.21.3
ii  dpkg-dev                   1.20.9
ii  dput                       1.1.0
ii  git [git-core]             1:2.30.2-1
ii  git-buildpackage           0.9.22
ii  libdpkg-perl               1.20.9
ii  libjson-perl               4.03000-1
ii  liblist-moreutils-perl     0.430-2
ii  liblocale-gettext-perl     1.07-4+b1
ii  libtext-csv-perl           2.00-1
ii  libtext-glob-perl          0.11-1
ii  libtext-iconv-perl         1.7-7+b1
ii  libwww-curl-perl           4.17-7+b1
ii  perl [libdigest-sha-perl]  5.32.1-4+deb11u1

Versions of packages dgit recommends:
ii  distro-info-data             0.51
ii  liburi-perl                  5.08-1
ii  openssh-client [ssh-client]  1:8.4p1-5

Versions of packages dgit suggests:
ii  cowbuilder  0.89
ii  pbuilder    0.231
ii  sbuild      0.81.2

-- no debconf information

--- End Message ---
--- Begin Message ---
Source: dgit
Source-Version: 10.3
Done: Ian Jackson <[email protected]>

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 [email protected],
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Ian Jackson <[email protected]> (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 [email protected])


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

Format: 1.8
Date: Thu, 29 Dec 2022 00:51:29 +0000
Source: dgit
Architecture: source
Version: 10.3
Distribution: unstable
Urgency: medium
Maintainer: Ian Jackson <[email protected]>
Changed-By: Ian Jackson <[email protected]>
Closes: 935762 993769 1026918
Changes:
 dgit (10.3) unstable; urgency=medium
 .
   dgit useability improvements:
   * Silently tolerate mentions of debian/ in debian/source/include-binaries.
     Closes:#1026918.  [Report from Simon McVittie]
   * Scan for duplicated orig tarballs with different names,
     avoiding strange dpkg-source errors mentioning format 2.0.
     Closes:#993769.  [Report from Philip Hands]
   * Rename auto quilt mode to try-linear (retaining compat alias),
     to clarify that it won't automatically detect branch format.
     Closes:#935762.  [Report from David Bremner]
   * dgit(1): Clarify the non-split-brain --quilt options, explicitly
     stating that they expect a patched-applied (dgit view) branch.
 .
   Tainted object handling (relevant to Debian NEW):
   * dgit can now usually discover when --deliberately-* will be needed,
     before making signatures and attempting the actual push.
     Thus, missing a --deliberately no longer burns a version number.
   * This is #944855.  However, it depends new infrastructure,
     which is (in this version) only queried on a best-effort basis:
   * New protocol transaction (over ssh) with dgit repos server,
     to allow client to make a policy enquiry, and specifically to
     enquire about tainted objects.
   * More of the relevant error messages are now translatable via gettext.
 .
   Supporting changes:
   * Modest refactoring to support the new functionality.
   * Tests for new functionality, and improved tests in changed areas.
   * tests: sbuild-gitish: Pass -v to sbuild for better debuggability.
Checksums-Sha1:
 0160c92c44d3727474f81ddc2fcd22ec701ba838 1856 dgit_10.3.dsc
 d6784fd162fdace427d2f9c3e0af645505e6bd72 679462 dgit_10.3.tar.gz
Checksums-Sha256:
 cbd0fd20fdda0bb62e7bf6fee9a7f05208e0a3d9e8ebdba28e6033c69809bc07 1856 
dgit_10.3.dsc
 1c228a35d56ee6adac8ff6fd73c9bea9238d272a246ffd3a2a86d84db43ada70 679462 
dgit_10.3.tar.gz
Files:
 cf5b73a3cf98732093e767af611aa1cb 1856 devel optional dgit_10.3.dsc
 89a5e50872c33f77b2c2275d027ec3df 679462 devel optional dgit_10.3.tar.gz

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEEVZrkbC1rbTJl58uh4+M5I0i1DTkFAmOs5kAACgkQ4+M5I0i1
DTnKQwf/T45tpUg9nD5TNz+sl23EWte6frrBli5qKaJIPWUvd144JyQctsE8JoRH
/Zmh5qY2c6LjVWZgE6uICoNtUzLL4iUvfj0D3PJ9fLF2faV8wb6s+uA7chEJQ3LR
O/0j+Iw77sPYo13d5HMxcBcoCuuB/CAIoUs8efV64oQAbJ1fy1U05HhkgXrqzOyw
t5xZ8BRMsndWgtji9LuTNZm5pGPWkbtQreQ51l0S2wOUC8W6+ZZTn4D7pFJcHMyO
8mUXbcNXyGLC4TTv1WmfWFpJu2I6wYI5G1I4AiLSf4lJJUqqE3RhHGay340hqs1o
Grjaypz6BYPettk+LKukc3yiUYwMwQ==
=tiue
-----END PGP SIGNATURE-----

--- End Message ---

Reply via email to