diff options
| author | Matthew Leeds <matthew.leeds@endlessm.com> | 2018-05-22 15:55:14 -0700 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-06-04 19:20:10 +0000 |
| commit | 8fbf19c9f54ba34ae7ebbc540b08566b8dd18848 (patch) | |
| tree | 524d9b3ab52563ba2f788771b3056a1c2361ea39 /src/ostree/ot-builtin-prune.c | |
| parent | f1d9196076d4aea1f64e0d2cbd17bfa2891b8c4c (diff) | |
| download | ostree-8fbf19c9f54ba34ae7ebbc540b08566b8dd18848.tar.gz | |
Make P2P API public (no longer experimental)
Currently the API that allows P2P operations (e.g. pulling an ostree ref
from a LAN or USB source) is hidden behind the configure flag
--enable-experimental-api. This commit makes the API public and makes
that flag essentially a no-op (leaving it in place in case we want to
use it again in the future). The P2P API has been tested over the last
several months and proven to work.
This means that since we're no longer using the "experimental" feature
flag, P2P builds of Flatpak will fail when using versions of OSTree from
this commit onwards, until Flatpak is patched in the near future. If you
want to build Flatpak < 0.11.8 with P2P enabled and link against OSTree
2018.6, you'll have to patch Flatpak. However, since Flatpak won't yet
have a hard dependency on OSTree 2018.6, it needs a new way to determine
if the P2P API in OSTree is available, so this commit adds a "p2p"
feature flag. This way the feature set is more semantically correct than
if we had continued to use the "experimental" feature flag.
In addition to making the P2P API public, this commit makes the P2P unit
tests run by default, removes the f27-experimental CI instance that's no
longer needed, changes a few man pages to reflect the changes, and
updates the bash completion script to accept the new commands and
options.
Closes: #1596
Approved by: cgwalters
Diffstat (limited to 'src/ostree/ot-builtin-prune.c')
| -rw-r--r-- | src/ostree/ot-builtin-prune.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/ostree/ot-builtin-prune.c b/src/ostree/ot-builtin-prune.c index c34bbf4c..2f560d14 100644 --- a/src/ostree/ot-builtin-prune.c +++ b/src/ostree/ot-builtin-prune.c @@ -59,9 +59,7 @@ static gboolean delete_commit (OstreeRepo *repo, const char *commit_to_delete, GCancellable *cancellable, GError **error) { g_autoptr(GHashTable) refs = NULL; /* (element-type utf8 utf8) */ -#ifdef OSTREE_ENABLE_EXPERIMENTAL_API g_autoptr(GHashTable) collection_refs = NULL; /* (element-type OstreeCollectionRef utf8) */ -#endif /* OSTREE_ENABLE_EXPERIMENTAL_API */ /* Check refs which are not in a collection. */ if (!ostree_repo_list_refs (repo, NULL, &refs, cancellable, error)) @@ -73,7 +71,6 @@ delete_commit (OstreeRepo *repo, const char *commit_to_delete, GCancellable *can return glnx_throw (error, "Commit '%s' is referenced by '%s'", commit_to_delete, ref); } -#ifdef OSTREE_ENABLE_EXPERIMENTAL_API /* And check refs which *are* in a collection. */ if (!ostree_repo_list_collection_refs (repo, NULL, &collection_refs, OSTREE_REPO_LIST_REFS_EXT_EXCLUDE_REMOTES, @@ -87,7 +84,6 @@ delete_commit (OstreeRepo *repo, const char *commit_to_delete, GCancellable *can return glnx_throw (error, "Commit '%s' is referenced by (%s, %s)", commit_to_delete, ref->collection_id, ref->ref_name); } -#endif /* OSTREE_ENABLE_EXPERIMENTAL_API */ if (!ot_enable_tombstone_commits (repo, error)) return FALSE; |