From: Richard Jones <rjones@redhat.com>
Date: Fri, 9 Apr 2010 08:40:59 +0000 (+0100)
Subject: Allow aug-ls to take Augeas variable as argument (RHBZ#580016).
X-Git-Tag: 1.3.2~12
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=d1dd00606d0b5b1430598e5092b017aa15d9ee11;p=libguestfs.git

Allow aug-ls to take Augeas variable as argument (RHBZ#580016).
---

diff --git a/daemon/augeas.c b/daemon/augeas.c
index de325de..36b36b8 100644
--- a/daemon/augeas.c
+++ b/daemon/augeas.c
@@ -348,7 +348,9 @@ do_aug_ls (const char *path)
 
   NEED_AUG (NULL);
 
-  ABS_PATH (path, return NULL);
+  /* Note that path might also be a previously defined variable
+   * (defined with aug_defvar).  See RHBZ#580016.
+   */
 
   len = strlen (path);
 
@@ -358,9 +360,8 @@ do_aug_ls (const char *path)
     return NULL;
   }
 
-  if (len == 1)
-    /* we know path must be "/" because of ABS_PATH above */
-    matches = do_aug_match ("/");
+  if (STREQ (path, "/"))
+    matches = do_aug_match ("/*");
   else {
     len += 3;			/* / * + terminating \0 */
     buf = malloc (len);