Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package compat-usrmerge for openSUSE:Factory
checked in at 2021-10-18 21:58:12
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/compat-usrmerge (Old)
and /work/SRC/openSUSE:Factory/.compat-usrmerge.new.1890 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "compat-usrmerge"
Mon Oct 18 21:58:12 2021 rev:5 rq:923737 version:84.87
Changes:
--------
--- /work/SRC/openSUSE:Factory/compat-usrmerge/compat-usrmerge.changes
2021-09-11 22:24:09.271364371 +0200
+++
/work/SRC/openSUSE:Factory/.compat-usrmerge.new.1890/compat-usrmerge.changes
2021-10-18 21:58:13.737921551 +0200
@@ -1,0 +2,10 @@
+Thu Oct 7 11:57:22 UTC 2021 - Ludwig Nussel <lnus...@suse.de>
+
+- Fix logic for detecting conflicts with directories (boo#1191111)
+
+-------------------------------------------------------------------
+Fri Aug 27 08:39:30 UTC 2021 - Ludwig Nussel <lnus...@suse.de>
+
+- exit file triggers early if alread usrmerged
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ compat-usrmerge.spec ++++++
--- /var/tmp/diff_new_pack.ZI34qZ/_old 2021-10-18 21:58:14.993922460 +0200
+++ /var/tmp/diff_new_pack.ZI34qZ/_new 2021-10-18 21:58:14.993922460 +0200
@@ -147,6 +147,7 @@
%endif
%filetriggerin -p <lua> -- %{_sbindir} %{_bindir} %{_libdir}
+if posix.stat("/lib", "type") ~= "directory" then return end
require("usrmerge")
if posix.getenv("VERBOSE_FILETRIGGERS") then
usrmerge.debug = "%{nvr}(in)"
@@ -159,6 +160,7 @@
io.flush()
%filetriggerpostun -p <lua> -- %{_sbindir} %{_bindir} %{_libdir}
+if posix.stat("/lib", "type") ~= "directory" then return end
-- the module is already gone if we get called for ourselves
if pcall(require, 'usrmerge') then
if posix.getenv("VERBOSE_FILETRIGGERS") then
@@ -173,6 +175,7 @@
end
%filetriggerpostun -p <lua> -- /sbin /bin /%{_lib}
+if posix.stat("/lib", "type") ~= "directory" then return end
-- the module is already gone if we get called for ourselves
if pcall(require, 'usrmerge') then
if posix.getenv("VERBOSE_FILETRIGGERS") then
++++++ convertfs ++++++
--- /var/tmp/diff_new_pack.ZI34qZ/_old 2021-10-18 21:58:15.025922483 +0200
+++ /var/tmp/diff_new_pack.ZI34qZ/_new 2021-10-18 21:58:15.029922486 +0200
@@ -69,7 +69,7 @@
# link on older distros
while read d; do
f="$ROOT/usr/$dir.usrmerge/$d"
- if test -e "$f" -a \( -L "$f" -o ! -d "$f" \); then
+ if test -L "$f" -o \( -e "$f" -a ! -d "$f" \); then
echo "Warning: /$dir/$d conflicts with directory /usr/$dir/$d and
will be removed"
rm -rf "$f.usrmerge~"
mv "$f" "$f.usrmerge~"
