Your message dated Sat, 16 Jul 2022 20:10:09 +0000
with message-id <e1oco77-0000uc...@fasolo.debian.org>
and subject line Bug#997866: fixed in usrmerge 26
has caused the Debian Bug report #997866,
regarding usrmerge: cannot handle generated files that have already been
re-generated in the new location
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.)
--
997866: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=997866
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Package: usrmerge
Version: 25
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu jammy ubuntu-patch
X-Debbugs-Cc: sl...@ubuntu.com
Dear Maintainer,
in certain cases where an application was upgraded to already generate
its files in the new usr-merged location (e.g. /usr/lib/...) instead of
the previous/old location in /lib/... the convert-usrmerge script can
run into error like this:
FATAL ERROR:
Both /lib/udev/hwdb.bin and /usr/lib/udev/hwdb.bin exist.
We can detect such scenarios by using an allow-list of known generated
files and clearing the legacy locations in such cases.
In Ubuntu, the attached patch was applied to achieve the following:
* Clear generated files if they have already been re-generated (LP: #1930573)
Thanks for considering the patch.
Cheers,
Lukas
-- System Information:
Debian Release: 11.0
APT prefers impish-updates
APT policy: (500, 'impish-updates'), (500, 'impish-security'), (500, 'impish')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 5.13.0-20-generic (SMP w/4 CPU threads)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_WARN, TAINT_OOT_MODULE
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8),
LANGUAGE=de_DE:en_GB:en
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru usrmerge-25ubuntu1/convert-usrmerge
usrmerge-25ubuntu2/convert-usrmerge
--- usrmerge-25ubuntu1/convert-usrmerge 2021-04-27 04:42:00.000000000 +0200
+++ usrmerge-25ubuntu2/convert-usrmerge 2021-10-26 11:11:12.000000000 +0200
@@ -162,6 +162,18 @@
fatal("Both $n and /usr$n exist");
}
+ # generated files
+ # if it was already re-generated in the new place, clear the legacy
location
+ # Origin of generated files:
+ # /lib/udev/hwdb.bin -> 'systemd-hwdb --usr update'
+ my @generated_files = qw(
+ /lib/udev/hwdb.bin
+ );
+ if (-e "/usr$n" && $n ~~ @generated_files) {
+ rm('-f', "$n");
+ return;
+ }
+
fatal("$n is a directory and /usr$n is not")
if -d $n and -e "/usr$n";
fatal("/usr$n is a directory and $n is not")
--- End Message ---
--- Begin Message ---
Source: usrmerge
Source-Version: 26
Done: Marco d'Itri <m...@linux.it>
We believe that the bug you reported is fixed in the latest version of
usrmerge, 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 997...@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Marco d'Itri <m...@linux.it> (supplier of updated usrmerge 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: SHA256
Format: 1.8
Date: Wed, 13 Jul 2022 10:11:02 +0200
Source: usrmerge
Binary: usrmerge usrmerged
Architecture: source all
Version: 26
Distribution: unstable
Urgency: medium
Maintainer: Marco d'Itri <m...@linux.it>
Changed-By: Marco d'Itri <m...@linux.it>
Description:
usrmerge - Convert the system to the merged /usr directories scheme
usrmerged - Transitional package to assert a merged-/usr system
Closes: 997866 1002888 1008202 1008203
Changes:
usrmerge (26) unstable; urgency=medium
.
* Created a dummy usrmerged package which will fail in preinst if the
system does not have a merged /usr. (See the TC decision #994388.)
* Implemented a flag file to skip the conversion, for the benefit of
buildds. (Closes: #1008203)
* Made postinst always fail if the conversion is not possible.
* Made postinst fail if overlayfs is involved. (Closes: #1008202)
* Removed the debconf question: now the conversion is unconditional.
* Created a list of files in / to be ignored if also present in /usr, on
request of Ubuntu. (Closes: #997866)
* Conflict with cruft. (Closes: #1002888)
Checksums-Sha1:
f3863e0da6ebe7c4bbef664ee126f2e7f1122c5e 930 usrmerge_26.dsc
216899beea9646f1dcc14b24a41f89237f69aa18 12564 usrmerge_26.tar.xz
59a0e63f28c9ff1b0532ecac04d2c07e504dc29f 11940 usrmerge_26_all.deb
a818c05aa3f52e4edaed8a72a5570df83a5db035 5507 usrmerge_26_amd64.buildinfo
c82f356c006e991c65a34630eced46fd3511a74b 4252 usrmerged_26_all.deb
Checksums-Sha256:
967e3190394d014843af13797859c29c12669b4ab9641a09db8771cce8053341 930
usrmerge_26.dsc
a1f51c7ddf2c1edae85a0a8377078c5e3b43837ec1faa28b8ab69a02c7b8d4c6 12564
usrmerge_26.tar.xz
dfe0081b9ff88ff3ddb47def33f50191653c39f00fc349634175a2e99124eb55 11940
usrmerge_26_all.deb
48080d5c2338285cbea233309c5a458d24fad2ebf69a83f3c0c9d741739638c9 5507
usrmerge_26_amd64.buildinfo
15e8875a3f6537db8827e74612fcaa796b98c6a8cc70122083138c9320873fdf 4252
usrmerged_26_all.deb
Files:
a9df8b1d04a4c7d85cc7bfc800d805a6 930 admin optional usrmerge_26.dsc
d71bee21f9126ad3d8204305f080eeac 12564 admin optional usrmerge_26.tar.xz
f969bc3762b09d12ce7cca2a2090442c 11940 admin optional usrmerge_26_all.deb
7cb8653029fa9bfc865f372b80d2c126 5507 admin optional
usrmerge_26_amd64.buildinfo
d0341aa1d934be4433b7dc5b45c1dbae 4252 oldlibs optional usrmerged_26_all.deb
-----BEGIN PGP SIGNATURE-----
iHUEARYIAB0WIQQnKUXNg20437dCfobLPsM64d7XgQUCYs9PoQAKCRDLPsM64d7X
gUauAQD7vESRYFEts8Y51X8X99R3DmPH4OSQzExozCSAN7WVagEAwpj6NuEN0zSt
nLgr0XbGCxVMpvTHn+4X65LT0izLAQk=
=OU1K
-----END PGP SIGNATURE-----
--- End Message ---
