diff options
| author | Stef Walter <stefw@redhat.com> | 2016-03-23 09:30:34 +0100 |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2016-03-23 13:55:34 -0400 |
| commit | 2454957e8dff9a88e5d6c10df15dec161277cc0a (patch) | |
| tree | 799aab40607a05f60a01ac6e9a9fdc707bfeba14 /src/libostree/ostree-repo-libarchive.c | |
| parent | 09238da065e8a442dcffdd1f8d906f4330a6e032 (diff) | |
| download | ostree-2454957e8dff9a88e5d6c10df15dec161277cc0a.tar.gz | |
Fix building without libarchive
Although libarchive is an optional build option, the build
fails without it.
https://bugzilla.gnome.org/show_bug.cgi?id=764056
Diffstat (limited to 'src/libostree/ostree-repo-libarchive.c')
| -rw-r--r-- | src/libostree/ostree-repo-libarchive.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/libostree/ostree-repo-libarchive.c b/src/libostree/ostree-repo-libarchive.c index 1c051592..7a30192c 100644 --- a/src/libostree/ostree-repo-libarchive.c +++ b/src/libostree/ostree-repo-libarchive.c @@ -290,7 +290,6 @@ write_libarchive_entry_to_mtree (OstreeRepo *self, out: return ret; } -#endif static gboolean create_empty_dir_with_uidgid (OstreeRepo *self, @@ -308,6 +307,7 @@ create_empty_dir_with_uidgid (OstreeRepo *self, return _ostree_repo_write_directory_meta (self, tmp_dir_info, NULL, out_csum, cancellable, error); } +#endif /** * ostree_repo_import_archive_to_mtree: @@ -331,6 +331,7 @@ ostree_repo_import_archive_to_mtree (OstreeRepo *self, GCancellable *cancellable, GError **error) { +#ifdef HAVE_LIBARCHIVE gboolean ret = FALSE; struct archive *a = archive; struct archive_entry *entry; @@ -393,6 +394,11 @@ ostree_repo_import_archive_to_mtree (OstreeRepo *self, ret = TRUE; out: return ret; +#else + g_set_error (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED, + "This version of ostree is not compiled with libarchive support"); + return FALSE; +#endif } /** |