Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package filesystem for openSUSE:Factory
checked in at 2021-10-08 22:04:36
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/filesystem (Old)
and /work/SRC/openSUSE:Factory/.filesystem.new.2443 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "filesystem"
Fri Oct 8 22:04:36 2021 rev:160 rq:923009 version:84.87
Changes:
--------
--- /work/SRC/openSUSE:Factory/filesystem/filesystem.changes 2021-08-03
22:48:32.388511422 +0200
+++ /work/SRC/openSUSE:Factory/.filesystem.new.2443/filesystem.changes
2021-10-08 22:04:41.888525567 +0200
@@ -1,0 +2,8 @@
+Fri Aug 27 07:26:40 UTC 2021 - Ludwig Nussel <lnus...@suse.de>
+
+- don't perform UsrMerge if ZYPP_SINGLE_RPMTRANS is set. Rely on
+ file trigger compat mode in that case and do it posttrans
+ (boo#1189788).
+- generic %ghost handling instead of hardcoding
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ filesystem.spec ++++++
--- /var/tmp/diff_new_pack.6c2L31/_old 2021-10-08 22:04:43.188527706 +0200
+++ /var/tmp/diff_new_pack.6c2L31/_new 2021-10-08 22:04:43.192527712 +0200
@@ -122,6 +122,20 @@
end
end
if needmigrate then
+ if posix.getenv("ZYPP_SINGLE_RPMTRANS") == "1" then
+ print("Warning: UsrMerge executed in single transcation mode")
+ if not posix.stat("/usr/lib/rpm/lua/usrmerge.lua") then
+ error("ERROR: compat-usrmerge file triggers not installed.\n!!! This
will go horribly wrong. You need a rescue system now !!!")
+ end
+ rpm.define("_filesystem_need_posttrans_convertfs 1")
+ else
+ assert(os.execute("/usr/libexec/convertfs"))
+ end
+end
+EOF
+
+cat > posttrans.lua <<'EOF'
+if rpm.expand("%%%%{?_filesystem_need_posttrans_convertfs}") == "1" then
assert(os.execute("/usr/libexec/convertfs"))
end
EOF
@@ -176,9 +190,9 @@
create_dir $MOD $OWN $GRP $NAME
done < directory.list
# ghost files next
-cat ghost.list | while read MOD OWN GRP NAME ; do
+while read MOD OWN GRP NAME ; do
create_dir $MOD $OWN $GRP $NAME "%%ghost "
-done
+done < ghost.list
# arch specific leftovers
for march in \
%ifarch %ix86
@@ -216,7 +230,7 @@
create_dir 0755 root root /emul/ia32-linux
%endif
# now do the links
-while read SRC DEST ; do
+while read SRC DEST ATTR ; do
case $SRC in
"") continue ;;
\#*) echo "comment: $SRC $DEST" ;;
@@ -229,8 +243,7 @@
esac
ln -sf $SRC $RPM_BUILD_ROOT$DEST
case $DEST in
- /var/run|/var/lock) echo "%ghost $DEST" >> filesystem.list ;;
- *) echo "$DEST" >> filesystem.list ;;
+ *) echo "$ATTR${ATTR:+ }$DEST" >> filesystem.list ;;
esac
# for tmpfiles.d
case $DEST in
@@ -305,6 +318,7 @@
%pretrans -p <lua> -f pretrans.lua
%pre -p <lua> -f pre.lua
+%posttrans -p <lua> -f posttrans.lua
%files -f filesystem.list
/usr/lib/tmpfiles.d/fs-tmp.conf
++++++ filesystem.links ++++++
--- /var/tmp/diff_new_pack.6c2L31/_old 2021-10-08 22:04:43.256527818 +0200
+++ /var/tmp/diff_new_pack.6c2L31/_new 2021-10-08 22:04:43.256527818 +0200
@@ -2,4 +2,4 @@
# Required for FHS 2.1
spool/mail /var/mail
# systemd
-../run /var/run
+../run /var/run %ghost
