diff --git a/src/app/rpmostree-db-builtin-list.c b/src/app/rpmostree-db-builtin-list.c index e09da6cd29..ce284abf1d 100644 --- a/src/app/rpmostree-db-builtin-list.c +++ b/src/app/rpmostree-db-builtin-list.c @@ -50,7 +50,7 @@ _builtin_db_list (OstreeRepo *repo, if (!*mrev) mrev = NULL; - range_revs = _rpmostree_util_get_commit_hashes (repo, revdup, mrev, cancellable, error); + range_revs = _rpmostree_util_get_commit_hashes (repo, revdup, mrev, error); if (!range_revs) return FALSE; diff --git a/src/app/rpmostree-db-builtin-version.c b/src/app/rpmostree-db-builtin-version.c index 843d4d5dc6..f8337b4203 100644 --- a/src/app/rpmostree-db-builtin-version.c +++ b/src/app/rpmostree-db-builtin-version.c @@ -51,7 +51,7 @@ _builtin_db_version (OstreeRepo *repo, GPtrArray *revs, if (!*mrev) mrev = NULL; - range_revs = _rpmostree_util_get_commit_hashes (repo, revdup, mrev, cancellable, error); + range_revs = _rpmostree_util_get_commit_hashes (repo, revdup, mrev, error); if (!range_revs) return FALSE; diff --git a/src/libpriv/rpmostree-util.c b/src/libpriv/rpmostree-util.c index 030e1f6813..6f8b4323c3 100644 --- a/src/libpriv/rpmostree-util.c +++ b/src/libpriv/rpmostree-util.c @@ -111,7 +111,6 @@ GPtrArray * _rpmostree_util_get_commit_hashes (OstreeRepo *repo, const char *beg, const char *end, - GCancellable *cancellable, GError **error) { GPtrArray *ret = NULL; @@ -121,14 +120,14 @@ _rpmostree_util_get_commit_hashes (OstreeRepo *repo, char *checksum = NULL; gboolean worked = FALSE; - if (!ostree_repo_read_commit (repo, beg, NULL, &beg_checksum, cancellable, error)) + if (!ostree_repo_read_commit (repo, beg, NULL, &beg_checksum, NULL, error)) goto out; ret = g_ptr_array_new_with_free_func (g_free); g_ptr_array_add (ret, g_strdup (beg)); /* Add the user defined REFSPEC. */ if (end && - !ostree_repo_read_commit (repo, end, NULL, &end_checksum, cancellable, error)) + !ostree_repo_read_commit (repo, end, NULL, &end_checksum, NULL, error)) goto out; if (end && g_str_equal (end_checksum, beg_checksum)) diff --git a/src/libpriv/rpmostree-util.h b/src/libpriv/rpmostree-util.h index 14c1424c03..549456487e 100644 --- a/src/libpriv/rpmostree-util.h +++ b/src/libpriv/rpmostree-util.h @@ -59,7 +59,6 @@ GPtrArray * _rpmostree_util_get_commit_hashes (OstreeRepo *repo, const char *beg, const char *end, - GCancellable *cancellable, GError **error); gboolean