- adapted to libbtrfs changes to resurrect special btrfs directory comparison (bsc...

diff --git a/VERSION b/VERSION
index 6f4eebdf6f68fc72411793cdb19e3f1715b117f3..100435be135a32ae8974fe4dd281c4d3a9d62e02 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.8.1
+0.8.2

diff --git a/dists/debian/changelog b/dists/debian/changelog
index dd2a673b42e1e8cf26e311f10c8b48d9ecad0fcf..d6356951af5a07b9c168c9c164a0608382eff561 100644 (file)
--- a/dists/debian/changelog
+++ b/dists/debian/changelog
@@ -1,3 +1,9 @@
+snapper (0.8.2) stable; urgency=low
+
+  * Updated to version 0.8.2
+
+ -- Arvin Schnell <aschnell@suse.com>  Tue, 22 Jan 2019 11:07:18 +0100
+
 snapper (0.8.1) stable; urgency=low
 
   * Updated to version 0.8.1

diff --git a/package/snapper.changes b/package/snapper.changes
index a01e08ea8331ecf8c20196bfcd1e0e99ce1fc85f..7d80dfbe7cafaad93347adf699ca31e18ee2eb50 100644 (file)
--- a/package/snapper.changes
+++ b/package/snapper.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Jan 22 11:05:01 CET 2019 - aschnell@suse.com
+
+- adapted to libbtrfs changes to resurrect special btrfs directory
+  comparison (bsc#1111414)
+- version 0.8.2
+
 -------------------------------------------------------------------
 Fri Jan 18 10:45:54 CET 2019 - aschnell@suse.com
 

diff --git a/snapper/Btrfs.cc b/snapper/Btrfs.cc
index e54cacf167356e9a6084e8795bdbb30774bdddce..7bfcfb0df248ee25ff9f1836044c0e70b11ba2a5 100644 (file)
--- a/snapper/Btrfs.cc
+++ b/snapper/Btrfs.cc
@@ -1275,11 +1275,13 @@ namespace snapper
     {
        FdCloser fd_closer(fd);
 
+       unsigned int iterations = 0;
+
        while (true)
        {
            boost::this_thread::interruption_point();
 
-            // remove the fourth parameter for older versions of libbtrfs
+           // remove the fourth parameter for older versions of libbtrfs
            int r;
 
 #if BTRFS_LIB_VERSION < 101
@@ -1288,7 +1290,13 @@ namespace snapper
            r = btrfs_read_and_process_send_stream(fd, &send_ops, &*this, 0, 1);
 #endif
 
-           if (r < 0)
+           // Only return an error when r == -ENODATA if this was the
+           // first call to btrfs_read_and_process_send_stream(). See
+           // https://github.com/openSUSE/snapper/pull/438,
+           // https://bugzilla.suse.com/show_bug.cgi?id=1111414 and
+           // the btrfs-progs source code.
+
+           if (r < 0 && !(r == -ENODATA && iterations > 0))
            {
                y2err("btrfs_read_and_process_send_stream failed " << r);
 
@@ -1308,6 +1316,7 @@ namespace snapper
                return true;
            }
 
+           ++iterations;
        }
     }