From 1c10e4f73d74cc837ce77f73a45d75922c6b14d73da1b1f3b13fe283e34597bd Mon Sep 17 00:00:00 2001
From: Olaf Hering <ohering@suse.com>
Date: Tue, 22 Oct 2013 09:09:06 +0000
Subject: [PATCH] Accepting request 204260 from Virtualization

after being unable to submit a specific revision to Factory, revert to the desired revision 242 before submitting to Factory.

OBS-URL: https://build.opensuse.org/request/show/204260
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=244
---
 ...geas-Don-t-test-if-AUG_NO_ERR_CLOSE-.patch | 44 ------------------
 ...geas-Enhance-error-reporting-for-aug.patch | 46 -------------------
 libguestfs.spec                               |  4 --
 3 files changed, 94 deletions(-)
 delete mode 100644 0001-Revert-daemon-augeas-Don-t-test-if-AUG_NO_ERR_CLOSE-.patch
 delete mode 100644 0002-Revert-daemon-augeas-Enhance-error-reporting-for-aug.patch

diff --git a/0001-Revert-daemon-augeas-Don-t-test-if-AUG_NO_ERR_CLOSE-.patch b/0001-Revert-daemon-augeas-Don-t-test-if-AUG_NO_ERR_CLOSE-.patch
deleted file mode 100644
index bdfe985..0000000
--- a/0001-Revert-daemon-augeas-Don-t-test-if-AUG_NO_ERR_CLOSE-.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-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;
- }
diff --git a/0002-Revert-daemon-augeas-Enhance-error-reporting-for-aug.patch b/0002-Revert-daemon-augeas-Enhance-error-reporting-for-aug.patch
deleted file mode 100644
index 6154cab..0000000
--- a/0002-Revert-daemon-augeas-Enhance-error-reporting-for-aug.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-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;
- }
diff --git a/libguestfs.spec b/libguestfs.spec
index d2fed6c..0bd6755 100644
--- a/libguestfs.spec
+++ b/libguestfs.spec
@@ -146,8 +146,6 @@ 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
@@ -431,8 +429,6 @@ virtual machines.
 %prep
 : _ignore_exclusive_arch '%{?_ignore_exclusive_arch}'
 %setup -q -a 789653
-%patch0001 -p1
-%patch0002 -p1
 %patch1000 -p1
 
 %build