Your message dated Sat, 16 Jul 2022 20:10:09 +0000
with message-id <e1oco77-0000vc...@fasolo.debian.org>
and subject line Bug#997866: fixed in usrmerge 27
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: 27
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: Thu, 14 Jul 2022 23:58:40 +0200
Source: usrmerge
Binary: usr-is-merged usrmerge
Architecture: source all
Version: 27
Distribution: unstable
Urgency: medium
Maintainer: Marco d'Itri <m...@linux.it>
Changed-By: Marco d'Itri <m...@linux.it>
Description:
usr-is-merged - Transitional package to assert a merged-/usr system
usrmerge - Convert the system to the merged /usr directories scheme
Closes: 997866 1002888 1008202 1008203
Changes:
usrmerge (27) unstable; urgency=medium
.
* Created a dummy usr-is-merged 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:
83d95f86e27c458edfc706683ab26b7694954f71 938 usrmerge_27.dsc
8d3df3cd429d75309435c67be187fe968e410307 12576 usrmerge_27.tar.xz
86a0fb6742687bd932ebb7213b9bde0db3fc4d08 4256 usr-is-merged_27_all.deb
0bd3746f73e6fa9b6bf8731048d0e3440e0e363f 11948 usrmerge_27_all.deb
c423afb09105f9135480ae4ff749e7bc2661415d 5523 usrmerge_27_amd64.buildinfo
Checksums-Sha256:
966d93e4de7137351ee35c83fa5e3c76795143fa78396dbd2e3fac36bc8127c1 938
usrmerge_27.dsc
e4869b7e3377bca1b641f39ae58e8023ff94a1069201bc480dd8c6ab829d72d7 12576
usrmerge_27.tar.xz
86cbc4dce6bc8f2beb1884ee15c14270ceea923a2a0556ea8402feef21190613 4256
usr-is-merged_27_all.deb
590e84a4a3607cebb86ff698f33dc9f6ed3ef80ec27ad2307e2e83a1a94bbcce 11948
usrmerge_27_all.deb
519d90ad5075bde0eef54f7366f0239b83697b0df2f2039427f1fad6263f9b8b 5523
usrmerge_27_amd64.buildinfo
Files:
0464270b6b518902d8fcef65c8de3675 938 admin optional usrmerge_27.dsc
c2c28e7a321c8b73a8e0d2282719c439 12576 admin optional usrmerge_27.tar.xz
51a7fbe213e7a56094b67c3d83365337 4256 oldlibs optional usr-is-merged_27_all.deb
a1c4455414339129757e3270afe82698 11948 admin optional usrmerge_27_all.deb
08cfe3fe3860a15f41de0ef7b0c43c35 5523 admin optional
usrmerge_27_amd64.buildinfo
-----BEGIN PGP SIGNATURE-----
iHUEARYIAB0WIQQnKUXNg20437dCfobLPsM64d7XgQUCYtCS0gAKCRDLPsM64d7X
gSUpAP4jIKJaNglJBVqo/A9FX+fTGg1mGIvVqTBknfTCfsDF/AD+MJgLrXjW39Dd
eZBEOpnsp6lm1ufMHMnoYnhWH+tmtgM=
=D7fF
-----END PGP SIGNATURE-----
--- End Message ---
