From 53ca11ee44f71ed056f72df9769ca93b9a35e1a7 Mon Sep 17 00:00:00 2001
From: Richard Jones <rjones@redhat.com>
Date: Thu, 20 May 2010 10:39:44 +0100
Subject: 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.
---
 daemon/tar.c | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'daemon/tar.c')

diff --git a/daemon/tar.c b/daemon/tar.c
index 941f80bd..ce3ca786 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
-- 
cgit