revert AUG_NO_ERR_CLOSE changes

OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=243

0001-Revert-daemon-augeas-Don-t-test-if-AUG_NO_ERR_CLOSE-.patch

@@ -0,0 +1,44 @@
+From 3a50219454e12b9bc3524b282cb11cfc207d63b0 Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones@redhat.com>
+Date: Fri, 18 Oct 2013 14:57:34 +0100
+Subject: Revert "daemon: augeas: Don't test if AUG_NO_ERR_CLOSE is defined."
+
+This reverts commit f59b87f7f18d9df89ff9940a317ff1fb452cbd28.
+
+See:
+https://www.redhat.com/archives/libguestfs/2013-October/msg00035.html
+---
+ daemon/augeas.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/daemon/augeas.c b/daemon/augeas.c
+index 45338da..9d6a553 100644
+--- a/daemon/augeas.c
++++ b/daemon/augeas.c
+@@ -98,20 +98,26 @@ do_aug_init (const char *root, int flags)
+     return -1;
+   }
+ 
++#ifdef AUG_NO_ERR_CLOSE
+   /* Pass AUG_NO_ERR_CLOSE so we can display detailed errors. */
+   aug = aug_init (buf, NULL, flags | AUG_NO_ERR_CLOSE);
++#else
++  aug = aug_init (buf, NULL, flags);
++#endif
+ 
+   if (!aug) {
+     reply_with_error ("augeas initialization failed");
+     return -1;
+   }
+ 
++#ifdef AUG_NO_ERR_CLOSE
+   if (aug_error (aug) != AUG_NOERROR) {
+     AUGEAS_ERROR ("aug_init: %s (flags %d)", root, flags);
+     aug_close (aug);
+     aug = NULL;
+     return -1;
+   }
++#endif
+ 
+   return 0;
+ }

0002-Revert-daemon-augeas-Enhance-error-reporting-for-aug.patch

@@ -0,0 +1,46 @@
+From 5ad4d2c2ecc3d7d74e34eedfe00a61bc7bebc8f0 Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones@redhat.com>
+Date: Fri, 18 Oct 2013 14:58:20 +0100
+Subject: Revert "daemon: augeas: Enhance error reporting for aug_init
+ failures."
+
+This reverts commit 272cc56876b9a3449da2fdfff546c598497d846d.
+
+See:
+https://www.redhat.com/archives/libguestfs/2013-October/msg00035.html
+---
+ daemon/augeas.c | 16 +---------------
+ 1 file changed, 1 insertion(+), 15 deletions(-)
+
+diff --git a/daemon/augeas.c b/daemon/augeas.c
+index 9d6a553..83e2739 100644
+--- a/daemon/augeas.c
++++ b/daemon/augeas.c
+@@ -98,26 +98,12 @@ do_aug_init (const char *root, int flags)
+     return -1;
+   }
+ 
+-#ifdef AUG_NO_ERR_CLOSE
+-  /* Pass AUG_NO_ERR_CLOSE so we can display detailed errors. */
+-  aug = aug_init (buf, NULL, flags | AUG_NO_ERR_CLOSE);
+-#else
+   aug = aug_init (buf, NULL, flags);
+-#endif
+ 
+   if (!aug) {
+-    reply_with_error ("augeas initialization failed");
+-    return -1;
+-  }
+-
+-#ifdef AUG_NO_ERR_CLOSE
+-  if (aug_error (aug) != AUG_NOERROR) {
+-    AUGEAS_ERROR ("aug_init: %s (flags %d)", root, flags);
+-    aug_close (aug);
+-    aug = NULL;
++    reply_with_error ("Augeas initialization failed");
+     return -1;
+   }
+-#endif
+ 
+   return 0;
+ }

libguestfs.spec

@@ -146,6 +146,8 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Summary:        Compatibility package for guestfs-tools
 License:        GPL-2.0
 Group:          System/Filesystems
+Patch0001:      0001-Revert-daemon-augeas-Don-t-test-if-AUG_NO_ERR_CLOSE-.patch
+Patch0002:      0002-Revert-daemon-augeas-Enhance-error-reporting-for-aug.patch
 Patch1000:      1000-force-virtio_blk-in-old-guest-kernel.patch
 Source0:        %{name}-%{version}.tar.xz
 Source789653:   Pod-Simple-3.23.tar.xz
@@ -429,6 +431,8 @@ virtual machines.
 %prep
 : _ignore_exclusive_arch '%{?_ignore_exclusive_arch}'
 %setup -q -a 789653
+%patch0001 -p1
+%patch0002 -p1
 %patch1000 -p1
 
 %build