repo: Note global transaction resume is legacy

See docs for details.

https://github.com/GNOME/ostree/pull/169

diff --git a/src/libostree/ostree-repo-commit.c b/src/libostree/ostree-repo-commit.c
index 091902857738b64bc6941551bf1393bd9d37eb80..5ea49efa5f9d751141789e5d5d68949653428728 100644 (file)
--- a/src/libostree/ostree-repo-commit.c
+++ b/src/libostree/ostree-repo-commit.c
@@ -1144,7 +1144,8 @@ ostree_repo_scan_hardlinks (OstreeRepo    *self,
  * ostree_repo_prepare_transaction:
  * @self: An #OstreeRepo
  * @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
  * @error: Error
  *

diff --git a/src/libostree/ostree-repo-pull.c b/src/libostree/ostree-repo-pull.c
index 907ed454d3148b5a8d68d7df1fed37bdeb158f41..c6c91082440a6b4e4abca9bb9b8ca4ffd72f6a0f 100644 (file)
--- a/src/libostree/ostree-repo-pull.c
+++ b/src/libostree/ostree-repo-pull.c
@@ -48,7 +48,7 @@ typedef struct {
   GCancellable *cancellable;
   OstreeAsyncProgress *progress;
 
-  gboolean      transaction_resuming;
+  gboolean      legacy_transaction_resuming;
   enum {
     OSTREE_PULL_PHASE_FETCHING_REFS,
     OSTREE_PULL_PHASE_FETCHING_OBJECTS
@@ -1227,7 +1227,7 @@ scan_one_metadata_object_c (OtPullData         *pull_data,
     }
   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. */
       if (objtype == OSTREE_OBJECT_TYPE_COMMIT)
@@ -2182,11 +2182,12 @@ ostree_repo_pull_with_options (OstreeRepo             *self,
   if (pull_data->fetcher == NULL)
     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))
     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);
   while (g_hash_table_iter_next (&hash_iter, &key, &value))