packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

repo: Note global transaction resume is legacy 

See docs for details.

https://github.com/GNOME/ostree/pull/169
This commit is contained in:
Colin Walters 2016-01-13 10:34:32 -05:00
parent 587fc5a5a1
commit 46c3fc5d76
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/libostree/ostree-repo-commit.c
View File

@ -1144,7 +1144,8 @@ ostree_repo_scan_hardlinks (OstreeRepo *self,
* ostree_repo_prepare_transaction: * ostree_repo_prepare_transaction:
* @self: An #OstreeRepo * @self: An #OstreeRepo
* @out_transaction_resume: (allow-none) (out): Whether this transaction * @out_transaction_resume: (allow-none) (out): Whether this transaction
* is resuming from a previous one. * is resuming from a previous one. This is a legacy state, now OSTree
* pulls use per-commit `state/.commitpartial` files.
* @cancellable: Cancellable * @cancellable: Cancellable
* @error: Error * @error: Error
* *

9
src/libostree/ostree-repo-pull.c
View File

@ -48,7 +48,7 @@ typedef struct {
GCancellable *cancellable; GCancellable *cancellable;
OstreeAsyncProgress *progress; OstreeAsyncProgress *progress;
gboolean transaction_resuming; gboolean legacy_transaction_resuming;
enum { enum {
OSTREE_PULL_PHASE_FETCHING_REFS, OSTREE_PULL_PHASE_FETCHING_REFS,
OSTREE_PULL_PHASE_FETCHING_OBJECTS OSTREE_PULL_PHASE_FETCHING_OBJECTS
@ -1227,7 +1227,7 @@ scan_one_metadata_object_c (OtPullData *pull_data,
} }
else if (is_stored) else if (is_stored)
{ {
gboolean do_scan = pull_data->transaction_resuming || is_requested || pull_data->commitpartial_exists; gboolean do_scan = pull_data->legacy_transaction_resuming || is_requested || pull_data->commitpartial_exists;
/* For commits, always refetch detached metadata. */ /* For commits, always refetch detached metadata. */
if (objtype == OSTREE_OBJECT_TYPE_COMMIT) if (objtype == OSTREE_OBJECT_TYPE_COMMIT)
@ -2182,11 +2182,12 @@ ostree_repo_pull_with_options (OstreeRepo *self,
if (pull_data->fetcher == NULL) if (pull_data->fetcher == NULL)
goto out; goto out;
if (!ostree_repo_prepare_transaction (pull_data->repo, &pull_data->transaction_resuming, if (!ostree_repo_prepare_transaction (pull_data->repo, &pull_data->legacy_transaction_resuming,
cancellable, error)) cancellable, error))
goto out; goto out;
g_debug ("resuming transaction: %s", pull_data->transaction_resuming ? "true" : " false"); if (pull_data->legacy_transaction_resuming)
g_debug ("resuming legacy transaction");
g_hash_table_iter_init (&hash_iter, commits_to_fetch); g_hash_table_iter_init (&hash_iter, commits_to_fetch);
while (g_hash_table_iter_next (&hash_iter, &key, &value)) while (g_hash_table_iter_next (&hash_iter, &key, &value))