From: Richard Jones <rjones@redhat.com>
Date: Thu, 20 May 2010 09:39:44 +0000 (+0100)
Subject: generator: Make 'xz' into an optional group.
X-Git-Tag: 1.3.14~18
X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=commitdiff_plain;h=53ca11ee44f71ed056f72df9769ca93b9a35e1a7;ds=sidebyside

generator: Make 'xz' into an optional group.

On Ubuntu <= Karmic, xz-utils was not packaged, and therefore
any xz-related tests would fail.  Thus make this an optional
group so that we can test for this and avoid running the tests
if xz utils are not present.
---

diff --git a/daemon/tar.c b/daemon/tar.c
index 941f80b..ce3ca78 100644
--- a/daemon/tar.c
+++ b/daemon/tar.c
@@ -28,6 +28,14 @@
 #include "../src/guestfs_protocol.h"
 #include "daemon.h"
 #include "actions.h"
+#include "optgroups.h"
+
+int
+optgroup_xz_available (void)
+{
+  int r = access ("/usr/bin/xz", X_OK);
+  return r == 0;
+}
 
 /* Redirect errors from the tar command to the error file, then
  * provide functions for reading it in.  We overwrite the file each
diff --git a/src/generator.ml b/src/generator.ml
index eb32698..d4ef81a 100755
--- a/src/generator.ml
+++ b/src/generator.ml
@@ -4455,7 +4455,7 @@ This command writes zeroes over the entire C<device>.  Compare
 with C<guestfs_zero> which just zeroes the first few blocks of
 a device.");
 
-  ("txz_in", (RErr, [FileIn "tarball"; Pathname "directory"]), 229, [],
+  ("txz_in", (RErr, [FileIn "tarball"; Pathname "directory"]), 229, [Optional "xz"],
    [InitBasicFS, Always, TestOutput (
       [["txz_in"; "../images/helloworld.tar.xz"; "/"];
        ["cat"; "/hello"]], "hello\n")],
@@ -4464,7 +4464,7 @@ a device.");
 This command uploads and unpacks local file C<tarball> (an
 I<xz compressed> tar file) into C<directory>.");
 
-  ("txz_out", (RErr, [Pathname "directory"; FileOut "tarball"]), 230, [],
+  ("txz_out", (RErr, [Pathname "directory"; FileOut "tarball"]), 230, [Optional "xz"],
    [],
    "pack directory into compressed tarball",
    "\