diff options
| author | Colin Walters <walters@verbum.org> | 2013-10-09 12:05:56 -0400 |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2013-10-09 12:05:56 -0400 |
| commit | 270812419004ab5a9fffa4598c4accf13aec7234 (patch) | |
| tree | 629ac924e1da53e2aea1a70e29e43025078c8339 /src/ostree/ot-builtin-pull-local.c | |
| parent | af1c9b8721987e0de64a3dfdf2a240ed312f7c6a (diff) | |
| download | ostree-270812419004ab5a9fffa4598c4accf13aec7234.tar.gz | |
repo: Tweak traversal API
It's convenient for bindings if we have a version that doesn't mutate
the hash table, because they pass temporary hash tables as input.
Diffstat (limited to 'src/ostree/ot-builtin-pull-local.c')
| -rw-r--r-- | src/ostree/ot-builtin-pull-local.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/ostree/ot-builtin-pull-local.c b/src/ostree/ot-builtin-pull-local.c index 6058b0e6..0feeddf2 100644 --- a/src/ostree/ot-builtin-pull-local.c +++ b/src/ostree/ot-builtin-pull-local.c @@ -256,8 +256,8 @@ ostree_builtin_pull_local (int argc, char **argv, OstreeRepo *repo, GCancellable { const char *checksum = value; - if (!ostree_repo_traverse_commit (data->src_repo, checksum, 0, source_objects, - cancellable, error)) + if (!ostree_repo_traverse_commit_union (data->src_repo, checksum, 0, source_objects, + cancellable, error)) goto out; } } @@ -268,9 +268,10 @@ ostree_builtin_pull_local (int argc, char **argv, OstreeRepo *repo, GCancellable while (g_hash_table_iter_next (&hash_iter, &key, &value)) { const char *checksum = key; + gs_unref_hashtable GHashTable *tmp_source_objects = NULL; - if (!ostree_repo_traverse_commit (data->src_repo, checksum, 0, source_objects, - cancellable, error)) + if (!ostree_repo_traverse_commit_union (data->src_repo, checksum, 0, source_objects, + cancellable, error)) goto out; } } |