rpms/libguestfs/EL-5 libguestfs-1.2.2-aug-clear.patch, NONE, 1.1 libguestfs.spec, 1.99, 1.100

[Richard W.M. Jones]

Author: rjones

Update of /cvs/pkgs/rpms/libguestfs/EL-5
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv23236

Modified Files:
	libguestfs.spec 
Added Files:
	libguestfs-1.2.2-aug-clear.patch 
Log Message:
- Backport the new API aug_clear from upstream development branch.


libguestfs-1.2.2-aug-clear.patch:
 daemon/augeas.c  |   20 ++++++++++++++++++++
 src/MAX_PROC_NR  |    2 +-
 src/generator.ml |   14 +++++++++++++-
 3 files changed, 34 insertions(+), 2 deletions(-)

--- NEW FILE libguestfs-1.2.2-aug-clear.patch ---
Backport of the guestfs_aug_clear API from upstream development branch
(commit 66477d07e37ffe66c).

diff -ur libguestfs-1.2.2.orig/daemon/augeas.c libguestfs-1.2.2/daemon/augeas.c
--- libguestfs-1.2.2.orig/daemon/augeas.c	2010-04-12 19:03:41.000000000 +0100
+++ libguestfs-1.2.2/daemon/augeas.c	2010-04-14 10:03:10.307680521 +0100
@@ -210,6 +210,26 @@
 }
 
 int
+do_aug_clear (const char *path)
+{
+#ifdef HAVE_AUGEAS
+  int r;
+
+  NEED_AUG (-1);
+
+  r = aug_set (aug, path, NULL);
+  if (r == -1) {
+    reply_with_error ("Augeas clear failed");
+    return -1;
+  }
+
+  return 0;
+#else
+  NOT_AVAILABLE (-1);
+#endif
+}
+
+int
 do_aug_insert (const char *path, const char *label, int before)
 {
 #ifdef HAVE_AUGEAS
diff -ur libguestfs-1.2.2.orig/src/generator.ml libguestfs-1.2.2/src/generator.ml
--- libguestfs-1.2.2.orig/src/generator.ml	2010-04-12 19:05:28.000000000 +0100
+++ libguestfs-1.2.2/src/generator.ml	2010-04-14 10:03:10.312679892 +0100
@@ -1238,7 +1238,12 @@
    [], (* XXX Augeas code needs tests. *)
    "set Augeas path to value",
    "\
-Set the value associated with C<path> to C<value>.");
+Set the value associated with C<path> to C<val>.
+
+In the Augeas API, it is possible to clear a node by setting
+the value to NULL.  Due to an oversight in the libguestfs API
+you cannot do that with this call.  Instead you must use the
+C<guestfs_aug_clear> call.");
 
   ("aug_insert", (RErr, [String "augpath"; String "label"; Bool "before"]), 21, [Optional "augeas"],
    [], (* XXX Augeas code needs tests. *)
@@ -4400,6 +4405,13 @@
 You will get undefined results for other partition table
 types (see C<guestfs_part_get_parttype>).");
 
+  ("aug_clear", (RErr, [String "augpath"]), 239, [Optional "augeas"],
+   [], (* XXX Augeas code needs tests. *)
+   "clear Augeas path",
+   "\
+Set the value associated with C<path> to C<NULL>.  This
+is the same as the L<augtool(1)> C<clear> command.");
+
 ]
 
 let all_functions = non_daemon_functions @ daemon_functions
diff -ur libguestfs-1.2.2.orig/src/MAX_PROC_NR libguestfs-1.2.2/src/MAX_PROC_NR
--- libguestfs-1.2.2.orig/src/MAX_PROC_NR	2010-04-12 19:06:21.000000000 +0100
+++ libguestfs-1.2.2/src/MAX_PROC_NR	2010-04-14 10:03:43.885055262 +0100
@@ -1 +1 @@
-236
+239


Index: libguestfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/EL-5/libguestfs.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -p -r1.99 -r1.100
--- libguestfs.spec	13 Apr 2010 08:37:57 -0000	1.99
+++ libguestfs.spec	14 Apr 2010 09:07:34 -0000	1.100
@@ -42,7 +42,7 @@ Summary:       Access and modify virtual
 Name:          libguestfs
 Epoch:         1
 Version:       1.2.2
-Release:       1%{?dist}.3
+Release:       1%{?dist}.4
 License:       LGPLv2+
 Group:         Development/Libraries
 URL:           http://libguestfs.org/
@@ -56,6 +56,9 @@ ExclusiveArch: %{ix86} x86_64
 # Disable FUSE tests, not supported in Koji at the moment.
 Patch0:        libguestfs-1.0.79-no-fuse-test.patch
 
+# Backport the new API aug_clear from upstream development branch.
+Patch1:        libguestfs-1.2.2-aug-clear.patch
+
 # Basic build requirements:
 BuildRequires: /usr/bin/pod2man
 BuildRequires: /usr/bin/pod2text
@@ -390,6 +393,7 @@ Requires:      jpackage-utils
 %setup -q
 
 %patch0 -p1
+%patch1 -p1
 
 mkdir -p daemon/m4
 
@@ -690,6 +694,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Apr 14 2010 Richard W.M. Jones <rjones at redhat.com> - 1:1.2.2-1.el5.4
+- Backport the new API aug_clear from upstream development branch.
+
 * Tue Apr 13 2010 Richard W.M. Jones <rjones at redhat.com> - 1:1.2.2-1.el5.3
 - Disable KVM again (see rel-eng ticket 2982).
 - Disable part-get-bootable test, fails with old version of parted.