summaryrefslogtreecommitdiff
path: root/src/ostree/ot-builtin-export.c
diff options
context:
space:
mode:
authorColin Walters <walters@verbum.org>2017-08-03 10:55:51 -0400
committerAtomic Bot <atomic-devel@projectatomic.io>2017-08-03 16:23:41 +0000
commit4e068f3924f57f7a4a26a91aab38c725520251fe (patch)
tree221736729aaef713eb234b4f4fff742c69ea1d89 /src/ostree/ot-builtin-export.c
parentd3897e52e7afb123de0eff6d83a318969286e4fb (diff)
downloadostree-4e068f3924f57f7a4a26a91aab38c725520251fe.tar.gz
tree-wide: Fix the build with old glib (Ubuntu Trusty etc.)
This regressed with <https://github.com/ostreedev/ostree/pull/1040> but currently the Travis builds aren't gating. Closes: #1051 Approved by: jlebon
Diffstat (limited to 'src/ostree/ot-builtin-export.c')
-rw-r--r--src/ostree/ot-builtin-export.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/ostree/ot-builtin-export.c b/src/ostree/ot-builtin-export.c
index a7c2e302..14960b12 100644
--- a/src/ostree/ot-builtin-export.c
+++ b/src/ostree/ot-builtin-export.c
@@ -20,12 +20,12 @@
#include "config.h"
+#include "otutil.h"
#include "ot-main.h"
#include "ot-builtins.h"
+#include "ostree-libarchive-private.h"
#include "ostree.h"
#include "ostree-repo-file.h"
-#include "ostree-libarchive-private.h"
-#include "otutil.h"
#ifdef HAVE_LIBARCHIVE
#include <archive.h>
@@ -68,7 +68,9 @@ ostree_builtin_export (int argc, char **argv, GCancellable *cancellable, GError
g_autoptr(GFile) subtree = NULL;
g_autofree char *commit = NULL;
g_autoptr(GVariant) commit_data = NULL;
+#ifdef HAVE_LIBARCHIVE
g_autoptr(OtAutoArchiveWrite) a = NULL;
+#endif
OstreeRepoExportArchiveOptions opts = { 0, };
context = g_option_context_new ("COMMIT - Stream COMMIT to stdout in tar format");