Your message dated Wed, 17 Aug 2022 16:44:51 +0000
with message-id <e1oom9z-0099ex...@fasolo.debian.org>
and subject line Bug#697630: fixed in reprepro 5.4.1-1
has caused the Debian Bug report #697630,
regarding Can't include changes files which contain a duplicate arch all
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 ow...@bugs.debian.org
immediately.)
--
697630: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=697630
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Package: reprepro
Version: 4.12.4-1
Severity: wishlist
Tags: patch
Hey,
With our usage of reprepro we get .changes files form multiple builders
(different architecture), all of them build arch dependent and arch
independent. This unfortunately means reprepro will error out as soon as a
second buld of an arch all package is received.
Attached patch adds the ability to ignore an arch all package included in a
.changes file if this is already present (from another build).
-- System Information:
Debian Release: 7.0
APT prefers unstable
APT policy: (500, 'unstable'), (500, 'testing'), (500, 'stable'), (101,
'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.7-trunk-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_GB.utf8, LC_CTYPE=en_GB.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Versions of packages reprepro depends on:
ii libarchive12 3.0.4-2
ii libbz2-1.0 1.0.6-4
ii libc6 2.13-38
ii libdb5.1 5.1.29-5
ii libgpg-error0 1.10-3.1
ii libgpgme11 1.2.0-1.4
ii zlib1g 1:1.2.7.dfsg-13
Versions of packages reprepro recommends:
ii apt 0.9.7.7
Versions of packages reprepro suggests:
pn gnupg-agent <none>
pn inoticoming <none>
pn lzip <none>
ii xz-utils [lzma] 5.1.1alpha+20120614-2
-- no debconf information
>From daffe8c0c12bc1766028d6a80c207edb48bbac98 Mon Sep 17 00:00:00 2001
From: Sjoerd Simons <sjoerd.sim...@collabora.co.uk>
Date: Mon, 7 Jan 2013 19:07:58 +0100
Subject: [PATCH] Add ability to ignore updates of arch all packages
When receiving builds from multiple architectures where all
architectures build architecture-indepent package including changes
files will fail because of the arch all packages. Add an ignore option
(updatedarchall) to ignore inclusion of these files.
This patch only applies this ignore to the "include" command.
---
checkin.c | 6 ++++++
docs/reprepro.1 | 4 ++++
ignore.h | 3 ++-
3 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/checkin.c b/checkin.c
index e2cf01a..e423b58 100644
--- a/checkin.c
+++ b/checkin.c
@@ -919,6 +919,12 @@ static retvalue changes_checkfiles(const char *filename, struct changes *changes
return RET_ERROR_OOM;
/* do not copy yet, but only check if it could be included */
r = files_canadd(e->filekey, e->checksums);
+
+ if (e->architecture_into == architecture_all &&
+ r == RET_ERROR_WRONG_MD5 &&
+ IGNORING (updatedarchall,
+"Trying to update an arch all package with a different checksum\n"))
+ r = RET_NOTHING;
if (RET_WAS_ERROR(r))
return r;
/* If is was already there, remember that */
diff --git a/docs/reprepro.1 b/docs/reprepro.1
index 779ffc7..096bb4e 100644
--- a/docs/reprepro.1
+++ b/docs/reprepro.1
@@ -2254,6 +2254,10 @@ Accept expired signatures with expired keys.
.B revokedkey \fR(I hope you know what you do)
Accept signatures with revoked keys.
(Only if the revoked key is explicitly requested).
+.B updatedarchall
+When asked to include a architecture all package into a repository which
+already includes that same file with a different checksum ignore the request.
+Useful when getting multiple builds include architecture independent packages
.SH GUESSING
When including a binary or source package without explicitly
declaring a component with
diff --git a/ignore.h b/ignore.h
index 5a64288..5d78518 100644
--- a/ignore.h
+++ b/ignore.h
@@ -36,7 +36,8 @@
IGN(wrongarchitecture) \
IGN(oldfile) \
IGN(longkeyid) \
- IGN(missingfile)
+ IGN(missingfile) \
+ IGN(updatedarchall)
enum ignore {
--
1.7.10.4
--- End Message ---
--- Begin Message ---
Source: reprepro
Source-Version: 5.4.1-1
Done: Bastian Germann <b...@debian.org>
We believe that the bug you reported is fixed in the latest version of
reprepro, 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 697...@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Bastian Germann <b...@debian.org> (supplier of updated reprepro 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 ftpmas...@ftp-master.debian.org)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
Format: 1.8
Date: Wed, 17 Aug 2022 17:43:04 +0200
Source: reprepro
Architecture: source
Version: 5.4.1-1
Distribution: experimental
Urgency: medium
Maintainer: Bastian Germann <b...@debian.org>
Changed-By: Bastian Germann <b...@debian.org>
Closes: 697630 827816 863061 1006766
Changes:
reprepro (5.4.1-1) experimental; urgency=medium
.
* Install native build-deps for arch:all
* Import new upstream version 5.4.1 (Closes: #697630, #863061, #1006766)
.
[ Luca Capello ]
* d/examples: Add mail-changes.example (Closes: #827816)
Checksums-Sha1:
96185184ac8c488c374e0390b70027c10b468c35 1771 reprepro_5.4.1-1.dsc
5251b185b3109f28cb16b6dbc59e862194135c11 459468 reprepro_5.4.1.orig.tar.xz
8ec7541f3777c0639d977256467e25e85407f91c 14728 reprepro_5.4.1-1.debian.tar.xz
baaffebf2aa452164f60132fa2542a0184ee9bae 10214
reprepro_5.4.1-1_source.buildinfo
Checksums-Sha256:
06aa684ef8061765173ef871ab0e4d1f50427efc508fe75705ca17cb191ec49b 1771
reprepro_5.4.1-1.dsc
9f0b8d543ff6606e2a057cb948638daa6d2c194896ec6a444f430e387e3ce0f9 459468
reprepro_5.4.1.orig.tar.xz
39f6b6cfdb1723729ab01ae07df0903ff1b5553be7e305e2e68b452e79e2ab1c 14728
reprepro_5.4.1-1.debian.tar.xz
c57805564888f44d2ec9b281e163b5ad22ee423d3d8d4783d97c9f9254c804fa 10214
reprepro_5.4.1-1_source.buildinfo
Files:
1a2f6154ce2573ba2729a0c8cb3dea80 1771 utils optional reprepro_5.4.1-1.dsc
3deb371bbf4891a92dfb7e41c906d17d 459468 utils optional
reprepro_5.4.1.orig.tar.xz
679608464df6da7d2b32b1dab691a615 14728 utils optional
reprepro_5.4.1-1.debian.tar.xz
614a7b45f871bc202e9e41bcfb7a911e 10214 utils optional
reprepro_5.4.1-1_source.buildinfo
-----BEGIN PGP SIGNATURE-----
iQHEBAEBCgAuFiEEQGIgyLhVKAI3jM5BH1x6i0VWQxQFAmL9EAIQHGJhZ2VAZGVi
aWFuLm9yZwAKCRAfXHqLRVZDFGGQC/47a5T/rY67oHOeFBRBQVnF9Dbhr7sGVVc1
JHP7LrsS0P6L+lICZvXuykj3WairRe9E5HwM1W4c+JVA+TtfnvWsCtnObozSo8bG
QnbPx9UaTpej6S4qfo5Kwo7Mzdi/VV+5qlvgSnjpRA0eLNi8c0vTGHiGQAWWZuSl
qSiWn2qyfK2JjOlrdH+A8yJBGfQRuEbzq2N0+EHQvkKPKfUDApNcMhSBreRg6I8a
f4ZK5Ssjik5lSZUw2mo4PlauTSgVPLjXlKMWQNuiOfFVJ72EpjSI5ta696TwtB46
fDpJllos6H8vpYHjG9tlKwQDZBwze5PdsBDHFO0MAI55QFoBuBmYDc1d+T+VjbtO
o5E3+/UrZ8RKeKjd7pynMGTdcxND7vslcpCTv9lN4UNglR7Gz54atrRNb2zBNvyY
OgmvJT5RBbOBoGT51bJ3iqO3nhgB7dGES5M5w+O++IF/bBa+g94At4H1f9NH7/L6
bGKAabqFshaExuRxZnIQWITxXwIL79U=
=xr0X
-----END PGP SIGNATURE-----
--- End Message ---
