diff --git a/src/app/rpmostree-libbuiltin.c b/src/app/rpmostree-libbuiltin.c index 2fa573f3..245f8b98 100644 --- a/src/app/rpmostree-libbuiltin.c +++ b/src/app/rpmostree-libbuiltin.c @@ -56,7 +56,7 @@ rpmostree_print_treepkg_diff (OstreeSysroot *sysroot, if (!ostree_sysroot_get_repo (sysroot, &repo, cancellable, error)) goto out; - if (!rpm_ostree_db_diff (repo, from_rev, to_rev, NULL, + if (!rpm_ostree_db_diff (repo, from_rev, to_rev, &removed, &added, &modified_old, &modified_new, cancellable, error)) goto out; diff --git a/src/lib/rpmostree-db.c b/src/lib/rpmostree-db.c index 9895a6d1..e716f3f4 100644 --- a/src/lib/rpmostree-db.c +++ b/src/lib/rpmostree-db.c @@ -140,7 +140,6 @@ rpm_ostree_db_query_all (OstreeRepo *repo, * @repo: An OSTree repository * @orig_ref: Original ref (branch or commit) * @new_ref: New ref (branch or commit) - * @query: (allow-none): A query, currently must be %NULL * @out_removed: (out) (transfer container) (element-type RpmOstreePackage): Return location for removed packages * @out_added: (out) (transfer container) (element-type RpmOstreePackage): Return location for added packages * @out_modified_old: (out) (transfer container) (element-type RpmOstreePackage): Return location for modified old packages @@ -165,7 +164,6 @@ gboolean rpm_ostree_db_diff (OstreeRepo *repo, const char *orig_ref, const char *new_ref, - GVariant *query, GPtrArray **out_removed, GPtrArray **out_added, GPtrArray **out_modified_old, @@ -185,7 +183,6 @@ rpm_ostree_db_diff (OstreeRepo *repo, guint i; HyPackage pkg; - g_return_val_if_fail (query == NULL, FALSE); g_return_val_if_fail (out_removed != NULL && out_added != NULL && out_modified_old != NULL && out_modified_new != NULL, FALSE); diff --git a/src/lib/rpmostree-db.h b/src/lib/rpmostree-db.h index c41ae9ea..7924feb6 100644 --- a/src/lib/rpmostree-db.h +++ b/src/lib/rpmostree-db.h @@ -33,7 +33,6 @@ _RPMOSTREE_EXTERN GPtrArray *rpm_ostree_db_query_all (OstreeRepo * _RPMOSTREE_EXTERN gboolean rpm_ostree_db_diff (OstreeRepo *repo, const char *orig_ref, const char *new_ref, - GVariant *query, GPtrArray **out_removed, GPtrArray **out_added, GPtrArray **out_modified_old, diff --git a/tests/manual/test-dbquery.py b/tests/manual/test-dbquery.py index 746dcd01..bd96158c 100644 --- a/tests/manual/test-dbquery.py +++ b/tests/manual/test-dbquery.py @@ -12,7 +12,7 @@ print "Package list: " for p in qr: print p.get_nevra() -_,removed,added,modold,modnew = RpmOstree.db_diff(r, ref + '^', ref, None, None) +_,removed,added,modold,modnew = RpmOstree.db_diff(r, ref + '^', ref, None) for p in removed: print "D " + p.get_nevra() for p in added: