Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package transactional-update for
openSUSE:Factory checked in at 2021-11-12 15:59:09
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/transactional-update (Old)
and /work/SRC/openSUSE:Factory/.transactional-update.new.1890 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "transactional-update"
Fri Nov 12 15:59:09 2021 rev:83 rq:930705 version:3.6.1
Changes:
--------
---
/work/SRC/openSUSE:Factory/transactional-update/transactional-update.changes
2021-10-26 20:13:30.802004088 +0200
+++
/work/SRC/openSUSE:Factory/.transactional-update.new.1890/transactional-update.changes
2021-11-12 15:59:48.210579889 +0100
@@ -1,0 +2,7 @@
+Wed Nov 10 14:55:06 UTC 2021 - Ignaz Forster <[email protected]>
+
+- Version 3.6.1
+ - Fix rsyncing /etc into the running system with
+ --drop-if-no-change [bsc#1192242]
+
+-------------------------------------------------------------------
Old:
----
transactional-update-3.6.0.tar.gz
New:
----
transactional-update-3.6.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ transactional-update.spec ++++++
--- /var/tmp/diff_new_pack.85Wl8L/_old 2021-11-12 15:59:48.718580124 +0100
+++ /var/tmp/diff_new_pack.85Wl8L/_new 2021-11-12 15:59:48.722580126 +0100
@@ -26,7 +26,7 @@
%{!?_distconfdir: %global _distconfdir %{_prefix}%{_sysconfdir}}
Name: transactional-update
-Version: 3.6.0
+Version: 3.6.1
Release: 0
Summary: Transactional Updates with btrfs and snapshots
License: GPL-2.0-or-later AND LGPL-2.1-or-later
++++++ transactional-update-3.6.0.tar.gz -> transactional-update-3.6.1.tar.gz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/transactional-update-3.6.0/NEWS
new/transactional-update-3.6.1/NEWS
--- old/transactional-update-3.6.0/NEWS 2021-10-22 19:49:32.000000000 +0200
+++ new/transactional-update-3.6.1/NEWS 2021-11-10 15:50:57.000000000 +0100
@@ -2,6 +2,10 @@
Copyright (C) 2016-2021 Thorsten Kukuk, Ignaz Forster et al.
+Version 3.6.1
+* Fix rsyncing /etc into the running system with --drop-if-no-change
+ [bsc#1192242]
+
Version 3.6
* Simplify mount hierarchy by just using a single slave bind mount as
the root of the update environment; this may avoid the error
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/transactional-update-3.6.0/configure.ac
new/transactional-update-3.6.1/configure.ac
--- old/transactional-update-3.6.0/configure.ac 2021-10-22 19:49:32.000000000
+0200
+++ new/transactional-update-3.6.1/configure.ac 2021-11-10 15:50:57.000000000
+0100
@@ -1,9 +1,9 @@
dnl Process this file with autoconf to produce a configure script.
-AC_INIT(transactional-update, 3.6.0)
+AC_INIT(transactional-update, 3.6.1)
# Increase on any interface change and reset revision
LIBTOOL_CURRENT=3
# Increase or reset on any VERSION update
-LIBTOOL_REVISION=5
+LIBTOOL_REVISION=6
# Increase if interface change is backwards compatible, reset otherwise
LIBTOOL_AGE=3
AC_CANONICAL_SYSTEM
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/transactional-update-3.6.0/lib/Overlay.cpp
new/transactional-update-3.6.1/lib/Overlay.cpp
--- old/transactional-update-3.6.0/lib/Overlay.cpp 2021-10-22
19:49:32.000000000 +0200
+++ new/transactional-update-3.6.1/lib/Overlay.cpp 2021-11-10
15:50:57.000000000 +0100
@@ -166,7 +166,7 @@
if (getIdOfOverlayDir(lowerdir) == getIdOfOverlayDir(currentUpper)) {
lower.append("/etc");
break;
- } else
+ }
// Replace /etc in lowerdir with /etc of overlay base
if (lowerdir == "/etc") {
std::unique_ptr<Snapshot> snap = SnapshotFactory::get();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/transactional-update-3.6.0/lib/Transaction.cpp
new/transactional-update-3.6.1/lib/Transaction.cpp
--- old/transactional-update-3.6.0/lib/Transaction.cpp 2021-10-22
19:49:32.000000000 +0200
+++ new/transactional-update-3.6.1/lib/Transaction.cpp 2021-11-10
15:50:57.000000000 +0100
@@ -377,7 +377,7 @@
// in /etc may be applied immediately, so merge them back into the
running system.
std::unique_ptr<Mount> mntEtc{new Mount{"/etc"}};
if (mntEtc->isMount() && mntEtc->getFilesystem() == "overlay") {
- Util::exec("rsync --archive --inplace --xattrs --acls --exclude
'fstab' --delete --quiet '" + std::string(pImpl->snapshot->getRoot()) + "/etc/'
/etc");
+ Util::exec("rsync --archive --inplace --xattrs --acls --exclude
'fstab' --delete --quiet '" + pImpl->bindDir + "/etc/' /etc");
}
return;
}
