diff --git a/backends/alpm/pk-backend-depends.c b/backends/alpm/pk-backend-depends.c index c3d82a0e6..ebf5edd68 100644 --- a/backends/alpm/pk-backend-depends.c +++ b/backends/alpm/pk-backend-depends.c @@ -137,7 +137,7 @@ pk_backend_find_requirer (PkBackend *self, alpm_list_t *pkgs, const gchar *name, } static gboolean -pk_backend_get_depends_thread (PkBackend *self) +pk_backend_depends_on_thread (PkBackend *self) { gchar **packages; alpm_list_t *i, *pkgs = NULL; @@ -173,7 +173,7 @@ pk_backend_get_depends_thread (PkBackend *self) break; } - depends = alpm_pkg_get_depends (i->data); + depends = alpm_pkg_depends_on (i->data); for (; depends != NULL; depends = depends->next) { gchar *depend; @@ -193,7 +193,7 @@ pk_backend_get_depends_thread (PkBackend *self) } static gboolean -pk_backend_get_requires_thread (PkBackend *self) +pk_backend_required_by_thread (PkBackend *self) { gchar **packages; alpm_list_t *i, *pkgs = NULL; @@ -248,23 +248,23 @@ pk_backend_get_requires_thread (PkBackend *self) } void -pk_backend_get_depends (PkBackend *self, PkBitfield filters, +pk_backend_depends_on (PkBackend *self, PkBitfield filters, gchar **package_ids, gboolean recursive) { g_return_if_fail (self != NULL); g_return_if_fail (package_ids != NULL); pk_backend_run (self, PK_STATUS_ENUM_QUERY, - pk_backend_get_depends_thread); + pk_backend_depends_on_thread); } void -pk_backend_get_requires (PkBackend *self, PkBitfield filters, +pk_backend_required_by (PkBackend *self, PkBitfield filters, gchar **package_ids, gboolean recursive) { g_return_if_fail (self != NULL); g_return_if_fail (package_ids != NULL); pk_backend_run (self, PK_STATUS_ENUM_QUERY, - pk_backend_get_requires_thread); + pk_backend_required_by_thread); } diff --git a/backends/apt/aptBackend.py b/backends/apt/aptBackend.py index 44ef6d3b0..8e694505c 100755 --- a/backends/apt/aptBackend.py +++ b/backends/apt/aptBackend.py @@ -1663,7 +1663,7 @@ def resolve(self, filters, names): "Package name %s could not be resolved" % name) @catch_pkerror - def get_depends(self, filters, ids, recursive): + def depends_on(self, filters, ids, recursive): """Emit all dependencies of the given package ids. Doesn't support recursive dependency resolution. @@ -1751,7 +1751,7 @@ def check_dependency(pkg, base_dep): emit_blocked_dependency(base_dep, filters=filters) @catch_pkerror - def get_requires(self, filters, ids, recursive): + def required_by(self, filters, ids, recursive): """Emit all packages which depend on the given ids. Recursive searching is not supported. diff --git a/backends/apt/pk-backend-apt.c b/backends/apt/pk-backend-apt.c index 768672d7e..d29fde666 100644 --- a/backends/apt/pk-backend-apt.c +++ b/backends/apt/pk-backend-apt.c @@ -131,10 +131,10 @@ pk_backend_download_packages (PkBackend *backend, PkBackendJob *job, gchar **pac } /** - * pk_backend_get_depends: + * pk_backend_depends_on: */ void -pk_backend_get_depends (PkBackend *backend, PkBackendJob *job, PkBitfield filters, gchar **package_ids, gboolean recursive) +pk_backend_depends_on (PkBackend *backend, PkBackendJob *job, PkBitfield filters, gchar **package_ids, gboolean recursive) { gchar *filters_text; gchar *package_ids_temp; @@ -181,10 +181,10 @@ pk_backend_get_files (PkBackend *backend, PkBackendJob *job, gchar **package_ids } /** - * pk_backend_get_requires: + * pk_backend_required_by: */ void -pk_backend_get_requires (PkBackend *backend, PkBackendJob *job, PkBitfield filters, gchar **package_ids, gboolean recursive) +pk_backend_required_by (PkBackend *backend, PkBackendJob *job, PkBitfield filters, gchar **package_ids, gboolean recursive) { gchar *package_ids_temp; gchar *filters_text; diff --git a/backends/aptcc/pk-backend-aptcc.cpp b/backends/aptcc/pk-backend-aptcc.cpp index ad988ed35..e5a36a53c 100644 --- a/backends/aptcc/pk-backend-aptcc.cpp +++ b/backends/aptcc/pk-backend-aptcc.cpp @@ -200,7 +200,7 @@ void pk_backend_cancel(PkBackend *backend, PkBackendJob *job) } } -static void backend_get_depends_or_requires_thread(PkBackendJob *job, GVariant *params, gpointer user_data) +static void backend_depends_on_or_requires_thread(PkBackendJob *job, GVariant *params, gpointer user_data) { PkRoleEnum role; PkBitfield filters; @@ -249,7 +249,7 @@ static void backend_get_depends_or_requires_thread(PkBackendJob *job, GVariant * return; } - if (role == PK_ROLE_ENUM_GET_DEPENDS) { + if (role == PK_ROLE_ENUM_DEPENDS_ON) { apt->getDepends(output, ver, recursive); } else { apt->getRequires(output, ver, recursive); @@ -263,24 +263,24 @@ static void backend_get_depends_or_requires_thread(PkBackendJob *job, GVariant * } /** - * pk_backend_get_depends: + * pk_backend_depends_on: */ -void pk_backend_get_depends(PkBackend *backend, PkBackendJob *job, PkBitfield filters, +void pk_backend_depends_on(PkBackend *backend, PkBackendJob *job, PkBitfield filters, gchar **package_ids, gboolean recursive) { - pk_backend_job_thread_create(job, backend_get_depends_or_requires_thread, NULL, NULL); + pk_backend_job_thread_create(job, backend_depends_on_or_requires_thread, NULL, NULL); } /** - * pk_backend_get_requires: + * pk_backend_required_by: */ -void pk_backend_get_requires(PkBackend *backend, +void pk_backend_required_by(PkBackend *backend, PkBackendJob *job, PkBitfield filters, gchar **package_ids, gboolean recursive) { - pk_backend_job_thread_create(job, backend_get_depends_or_requires_thread, NULL, NULL); + pk_backend_job_thread_create(job, backend_depends_on_or_requires_thread, NULL, NULL); } /** @@ -1181,10 +1181,10 @@ PkBitfield pk_backend_get_roles(PkBackend *backend) PkBitfield roles; roles = pk_bitfield_from_enums( PK_ROLE_ENUM_CANCEL, - PK_ROLE_ENUM_GET_DEPENDS, + PK_ROLE_ENUM_DEPENDS_ON, PK_ROLE_ENUM_GET_DETAILS, PK_ROLE_ENUM_GET_FILES, - PK_ROLE_ENUM_GET_REQUIRES, + PK_ROLE_ENUM_REQUIRED_BY, PK_ROLE_ENUM_GET_PACKAGES, PK_ROLE_ENUM_WHAT_PROVIDES, PK_ROLE_ENUM_GET_UPDATES, diff --git a/backends/dummy/pk-backend-dummy.c b/backends/dummy/pk-backend-dummy.c index 59e83b88b..dce290702 100644 --- a/backends/dummy/pk-backend-dummy.c +++ b/backends/dummy/pk-backend-dummy.c @@ -159,10 +159,10 @@ pk_backend_cancel (PkBackend *backend, PkBackendJob *job) } /** - * pk_backend_get_depends: + * pk_backend_depends_on: */ void -pk_backend_get_depends (PkBackend *backend, PkBackendJob *job, PkBitfield filters, gchar **package_ids, gboolean recursive) +pk_backend_depends_on (PkBackend *backend, PkBackendJob *job, PkBitfield filters, gchar **package_ids, gboolean recursive) { pk_backend_job_set_status (job, PK_STATUS_ENUM_QUERY); @@ -294,10 +294,10 @@ pk_backend_get_files (PkBackend *backend, PkBackendJob *job, gchar **package_ids } /** - * pk_backend_get_requires: + * pk_backend_required_by: */ void -pk_backend_get_requires (PkBackend *backend, PkBackendJob *job, PkBitfield filters, gchar **package_ids, gboolean recursive) +pk_backend_required_by (PkBackend *backend, PkBackendJob *job, PkBitfield filters, gchar **package_ids, gboolean recursive) { pk_backend_job_set_status (job, PK_STATUS_ENUM_QUERY); pk_backend_job_package (job, PK_INFO_ENUM_INSTALLED, diff --git a/backends/entropy/entropyBackend.py b/backends/entropy/entropyBackend.py index 5ed433266..5203e1ee6 100755 --- a/backends/entropy/entropyBackend.py +++ b/backends/entropy/entropyBackend.py @@ -1022,9 +1022,8 @@ def _is_only_download(self, transaction_flags): @sharedreslock @sharedinstlock - def get_depends(self, filters, package_ids, recursive): - - self._log_message(__name__, "get_depends: got %s and %s and %s" % ( + def depends_on(self, filters, package_ids, recursive): + self._log_message(__name__, "depends_on: got %s and %s and %s" % ( filters, package_ids, recursive,)) self.status(STATUS_INFO) @@ -1036,11 +1035,11 @@ def get_depends(self, filters, package_ids, recursive): pkg = self._id_to_etp(pk_pkg) if pkg is None: # wtf! - self._log_message(__name__, "get_depends: cannot match %s" % ( + self._log_message(__name__, "depends_on: cannot match %s" % ( pk_pkg,)) continue - self._log_message(__name__, "get_depends: translated %s => %s" % ( + self._log_message(__name__, "depends_on: translated %s => %s" % ( pk_pkg, pkg,)) pkg_id, repo_db = pkg @@ -1048,7 +1047,7 @@ def get_depends(self, filters, package_ids, recursive): pkgs.add((repo, pkg_id, repo_db,)) matches = [(y, x) for x, y, z in pkgs] - self._log_message(__name__, "get_depends: raw matches => %s" % ( + self._log_message(__name__, "depends_on: raw matches => %s" % ( matches,)) empty = False @@ -1085,7 +1084,7 @@ def get_depends(self, filters, package_ids, recursive): pkgs = set(install + removal) - self._log_message(__name__, "get_depends: matches %s" % ( + self._log_message(__name__, "depends_on: matches %s" % ( pkgs,)) # now filter @@ -1300,9 +1299,8 @@ def get_repo_list(self, filters): @sharedreslock @sharedinstlock - def get_requires(self, filters, package_ids, recursive): - - self._log_message(__name__, "get_requires: got %s and %s and %s" % ( + def required_by(self, filters, package_ids, recursive): + self._log_message(__name__, "required_by: got %s and %s and %s" % ( filters, package_ids, recursive)) self.status(STATUS_INFO) @@ -1314,11 +1312,11 @@ def get_requires(self, filters, package_ids, recursive): pkg = self._id_to_etp(pk_pkg) if pkg is None: # wtf! - self._log_message(__name__, "get_requires: cannot match %s" % ( + self._log_message(__name__, "required_by: cannot match %s" % ( pk_pkg,)) continue - self._log_message(__name__, "get_requires: translated %s => %s" % ( + self._log_message(__name__, "required_by: translated %s => %s" % ( pk_pkg, pkg,)) pkg_id, repo_db = pkg @@ -1327,7 +1325,7 @@ def get_requires(self, filters, package_ids, recursive): matches = [(y, x) for x, y, z in pkgs] - self._log_message(__name__, "get_requires: cooked => %s" % ( + self._log_message(__name__, "required_by: cooked => %s" % ( matches,)) empty = False @@ -1335,13 +1333,13 @@ def get_requires(self, filters, package_ids, recursive): reverse_deps = self._entropy.get_reverse_queue(matches, deep = deep, recursive = recursive) - self._log_message(__name__, "get_requires: reverse_deps => %s" % ( + self._log_message(__name__, "required_by: reverse_deps => %s" % ( reverse_deps,)) pkgs = set([(y, x, self._entropy.open_repository(y),) for x, y in \ reverse_deps]) - self._log_message(__name__, "get_requires: matches %s" % ( + self._log_message(__name__, "required_by: matches %s" % ( pkgs,)) # now filter diff --git a/backends/entropy/pk-backend-entropy.c b/backends/entropy/pk-backend-entropy.c index 264fee259..66db0f4bc 100644 --- a/backends/entropy/pk-backend-entropy.c +++ b/backends/entropy/pk-backend-entropy.c @@ -141,10 +141,10 @@ pk_backend_get_roles (PkBackend *backend) PkBitfield roles; roles = pk_bitfield_from_enums ( PK_ROLE_ENUM_CANCEL, - PK_ROLE_ENUM_GET_DEPENDS, + PK_ROLE_ENUM_DEPENDS_ON, PK_ROLE_ENUM_GET_DETAILS, PK_ROLE_ENUM_GET_FILES, - PK_ROLE_ENUM_GET_REQUIRES, + PK_ROLE_ENUM_REQUIRED_BY, PK_ROLE_ENUM_GET_PACKAGES, PK_ROLE_ENUM_WHAT_PROVIDES, PK_ROLE_ENUM_GET_UPDATES, @@ -241,10 +241,10 @@ pk_backend_get_categories(PkBackend *backend, } /** - * pk_backend_get_depends: + * pk_backend_depends_on: */ void -pk_backend_get_depends(PkBackend *backend, +pk_backend_depends_on(PkBackend *backend, PkBackendJob *job, PkBitfield filters, gchar **package_ids, @@ -606,10 +606,10 @@ pk_backend_get_repo_list(PkBackend *backend, } /** - * pk_backend_get_requires: + * pk_backend_required_by: */ void -pk_backend_get_requires(PkBackend *backend, +pk_backend_required_by(PkBackend *backend, PkBackendJob *job, PkBitfield filters, gchar **package_ids, diff --git a/backends/hawkey/hif-package.c b/backends/hawkey/hif-package.c index 9e8c3a77b..7397a9eda 100644 --- a/backends/hawkey/hif-package.c +++ b/backends/hawkey/hif-package.c @@ -282,7 +282,7 @@ hif_package_is_gui (HyPackage pkg) int size; /* find if the package depends on GTK or KDE */ - reldeplist = hy_package_get_requires (pkg); + reldeplist = hy_package_required_by (pkg); size = hy_reldeplist_count (reldeplist); for (idx = 0; idx < size && !ret; idx++) { reldep = hy_reldeplist_get_clone (reldeplist, idx); diff --git a/backends/pisi/pisiBackend.py b/backends/pisi/pisiBackend.py index 0266bde24..3acc2aab6 100755 --- a/backends/pisi/pisiBackend.py +++ b/backends/pisi/pisiBackend.py @@ -136,7 +136,7 @@ def __get_package(self, package, filters=None): return self.package(id, status, pkg.summary) - def get_depends(self, filters, package_ids, recursive): + def depends_on(self, filters, package_ids, recursive): """ Prints a list of depends for a given package """ self.allow_cancel(True) self.percentage(None) @@ -207,7 +207,7 @@ def get_repo_list(self, filters): uri = self.repodb.get_repo(repo).indexuri.get_uri() self.repo_detail(repo, uri, True) - def get_requires(self, filters, package_ids, recursive): + def required_by(self, filters, package_ids, recursive): """ Prints a list of requires for a given package """ self.allow_cancel(True) self.percentage(None) diff --git a/backends/pisi/pk-backend-pisi.c b/backends/pisi/pk-backend-pisi.c index fa4a17084..716dee540 100644 --- a/backends/pisi/pk-backend-pisi.c +++ b/backends/pisi/pk-backend-pisi.c @@ -136,10 +136,10 @@ pk_backend_download_packages (PkBackend *backend, PkBackendJob *job, gchar **pac } /** - * pk_backend_get_depends: + * pk_backend_depends_on: */ void -pk_backend_get_depends (PkBackend *backend, PkBackendJob *job, PkBitfield filters, gchar **package_ids, gboolean recursive) +pk_backend_depends_on (PkBackend *backend, PkBackendJob *job, PkBitfield filters, gchar **package_ids, gboolean recursive) { gchar *filters_text; gchar *package_ids_temp; @@ -175,10 +175,10 @@ pk_backend_get_files (PkBackend *backend, PkBackendJob *job, gchar **package_ids } /** - * pk_backend_get_requires: + * pk_backend_required_by: */ void -pk_backend_get_requires (PkBackend *backend, PkBackendJob *job, PkBitfield filters, gchar **package_ids, gboolean recursive) +pk_backend_required_by (PkBackend *backend, PkBackendJob *job, PkBitfield filters, gchar **package_ids, gboolean recursive) { gchar *filters_text; gchar *package_ids_temp; diff --git a/backends/poldek/pk-backend-poldek.c b/backends/poldek/pk-backend-poldek.c index 8f31ca995..915493f48 100644 --- a/backends/poldek/pk-backend-poldek.c +++ b/backends/poldek/pk-backend-poldek.c @@ -2543,10 +2543,10 @@ pk_backend_download_packages (PkBackend *backend, PkBackendJob *job, gchar **pac } /** - * backend_get_depends_thread: + * backend_depends_on_thread: */ static void -backend_get_depends_thread (PkBackendJob *job, GVariant *params, gpointer user_data) +backend_depends_on_thread (PkBackendJob *job, GVariant *params, gpointer user_data) { PkBitfield filters; gboolean recursive; @@ -2589,13 +2589,13 @@ backend_get_depends_thread (PkBackendJob *job, GVariant *params, gpointer user_d } void -pk_backend_get_depends (PkBackend *backend, PkBackendJob *job, PkBitfield filters, gchar **package_ids, gboolean recursive) +pk_backend_depends_on (PkBackend *backend, PkBackendJob *job, PkBitfield filters, gchar **package_ids, gboolean recursive) { pk_backend_job_set_status (job, PK_STATUS_ENUM_QUERY); poldek_backend_set_allow_cancel (job, FALSE, TRUE); pb_error_clean (); - pk_backend_job_thread_create (job, backend_get_depends_thread, NULL, NULL); + pk_backend_job_thread_create (job, backend_depends_on_thread, NULL, NULL); } /** @@ -2797,10 +2797,10 @@ pk_backend_get_packages (PkBackend *backend, PkBackendJob *job, PkBitfield filte } /** - * backend_get_requires_thread: + * backend_required_by_thread: */ static void -backend_get_requires_thread (PkBackendJob *job, GVariant *params, gpointer user_data) +backend_required_by_thread (PkBackendJob *job, GVariant *params, gpointer user_data) { struct pkg *pkg; tn_array *reqpkgs, *available, *installed; @@ -2841,13 +2841,13 @@ backend_get_requires_thread (PkBackendJob *job, GVariant *params, gpointer user_ } void -pk_backend_get_requires (PkBackend *backend, PkBackendJob *job, PkBitfield filters, gchar **package_ids, gboolean recursive) +pk_backend_required_by (PkBackend *backend, PkBackendJob *job, PkBitfield filters, gchar **package_ids, gboolean recursive) { pk_backend_job_set_status (job, PK_STATUS_ENUM_QUERY); poldek_backend_set_allow_cancel (job, FALSE, TRUE); pb_error_clean (); - pk_backend_job_thread_create (job, backend_get_requires_thread, NULL, NULL); + pk_backend_job_thread_create (job, backend_required_by_thread, NULL, NULL); } /** diff --git a/backends/portage/pk-backend-portage.c b/backends/portage/pk-backend-portage.c index 51742dcfe..214786d3f 100644 --- a/backends/portage/pk-backend-portage.c +++ b/backends/portage/pk-backend-portage.c @@ -141,10 +141,10 @@ pk_backend_get_roles (PkBackend *backend) PkBitfield roles; roles = pk_bitfield_from_enums ( PK_ROLE_ENUM_CANCEL, - PK_ROLE_ENUM_GET_DEPENDS, + PK_ROLE_ENUM_DEPENDS_ON, PK_ROLE_ENUM_GET_DETAILS, PK_ROLE_ENUM_GET_FILES, - PK_ROLE_ENUM_GET_REQUIRES, + PK_ROLE_ENUM_REQUIRED_BY, PK_ROLE_ENUM_GET_PACKAGES, //PK_ROLE_ENUM_WHAT_PROVIDES, PK_ROLE_ENUM_GET_UPDATES, @@ -190,10 +190,10 @@ pk_backend_get_categories (PkBackend *backend, PkBackendJob *job) } /** - * pk_backend_get_depends: + * pk_backend_depends_on: */ void -pk_backend_get_depends (PkBackend *backend, PkBackendJob *job, PkBitfield filters, gchar **package_ids, gboolean recursive) +pk_backend_depends_on (PkBackend *backend, PkBackendJob *job, PkBitfield filters, gchar **package_ids, gboolean recursive) { gchar *filters_text; gchar *package_ids_temp; @@ -442,10 +442,10 @@ pk_backend_get_repo_list (PkBackend *backend, PkBackendJob *job, PkBitfield filt } /** - * pk_backend_get_requires: + * pk_backend_required_by: */ void -pk_backend_get_requires (PkBackend *backend, PkBackendJob *job, PkBitfield filters, gchar **package_ids, gboolean recursive) +pk_backend_required_by (PkBackend *backend, PkBackendJob *job, PkBitfield filters, gchar **package_ids, gboolean recursive) { gchar *package_ids_temp; gchar *filters_text; diff --git a/backends/portage/portageBackend.py b/backends/portage/portageBackend.py index 7ed91c013..ccb7dde76 100755 --- a/backends/portage/portageBackend.py +++ b/backends/portage/portageBackend.py @@ -865,7 +865,7 @@ def get_categories(self): cat_id = name # same thing self.category("", cat_id, name, summary, icon) - def get_depends(self, filters, pkgs, recursive): + def depends_on(self, filters, pkgs, recursive): # TODO: use only myparams ? # TODO: improve error management / info @@ -1075,7 +1075,7 @@ def get_repo_list(self, filters): self.repo_detail(o, o, self._is_repo_enabled(installed_layman_db, o)) - def get_requires(self, filters, pkgs, recursive): + def required_by(self, filters, pkgs, recursive): # TODO: manage non-installed package # FILTERS: diff --git a/backends/ports/pk-backend-ports.c b/backends/ports/pk-backend-ports.c index 4cbed905b..d4fe583d6 100644 --- a/backends/ports/pk-backend-ports.c +++ b/backends/ports/pk-backend-ports.c @@ -168,10 +168,10 @@ pk_backend_download_packages (PkBackend *backend, PkBackendJob *job, gchar **pac } /** - * pk_backend_get_depends: + * pk_backend_depends_on: */ void -pk_backend_get_depends (PkBackend *backend, PkBackendJob *job, PkBitfield filters, gchar **package_ids, gboolean recursive) +pk_backend_depends_on (PkBackend *backend, PkBackendJob *job, PkBitfield filters, gchar **package_ids, gboolean recursive) { gchar *filters_text; gchar *package_ids_temp; @@ -422,10 +422,10 @@ pk_backend_get_repo_list (PkBackend *backend, PkBackendJob *job, PkBitfield filt } /** - * pk_backend_get_requires: + * pk_backend_required_by: */ void -pk_backend_get_requires (PkBackend *backend, PkBackendJob *job, PkBitfield filters, gchar **package_ids, gboolean recursive) +pk_backend_required_by (PkBackend *backend, PkBackendJob *job, PkBitfield filters, gchar **package_ids, gboolean recursive) { gchar *package_ids_temp; gchar *filters_text; diff --git a/backends/ports/portsBackend.rb b/backends/ports/portsBackend.rb index 40f8217d6..dde35eb42 100755 --- a/backends/ports/portsBackend.rb +++ b/backends/ports/portsBackend.rb @@ -330,7 +330,7 @@ def search_file(filters, key) end end - def get_depends(filters, package_ids, recursive) + def depends_on(filters, package_ids, recursive) status(STATUS_INFO) package_ids.each do |package| name, version, arch, data = split_package_id(package) @@ -431,7 +431,7 @@ def get_files(package_ids) end end - def get_requires(filters, package_ids, recursive) + def required_by(filters, package_ids, recursive) status(STATUS_INFO) package_ids.each do |package| name, version, arch, data = split_package_id(package) diff --git a/backends/ports/ruby_packagekit/backend.rb b/backends/ports/ruby_packagekit/backend.rb index bc1ab97a5..d6f4235b7 100644 --- a/backends/ports/ruby_packagekit/backend.rb +++ b/backends/ports/ruby_packagekit/backend.rb @@ -97,7 +97,7 @@ def dispatch_command(cmd, args) filters = args[0].split(FLAGS_DELIM) package_ids = args[1].split(PACKAGE_IDS_DELIM) recursive = to_b(args[2]) - get_depends(filters, package_ids, recursive) + depends_on(filters, package_ids, recursive) finished() when cmd == 'get-details' package_ids = args[0].split(PACKAGE_IDS_DELIM) @@ -111,7 +111,7 @@ def dispatch_command(cmd, args) filters = args[0].split(FLAGS_DELIM) package_ids = args[1].split(PACKAGE_IDS_DELIM) recursive = to_b(args[2]) - get_requires(filters, package_ids, recursive) + required_by(filters, package_ids, recursive) finished() when cmd == 'get-update-detail' package_ids = args[0].split(PACKAGE_IDS_DELIM) diff --git a/backends/smart/pk-backend-smart.c b/backends/smart/pk-backend-smart.c index f3e3c4763..25a799fca 100644 --- a/backends/smart/pk-backend-smart.c +++ b/backends/smart/pk-backend-smart.c @@ -165,10 +165,10 @@ pk_backend_download_packages (PkBackend *backend, PkBackendJob *job, gchar **pac } /** - * pk_backend_get_depends: + * pk_backend_depends_on: */ void -pk_backend_get_depends (PkBackend *backend, PkBackendJob *job, PkBitfield filters, gchar **package_ids, gboolean recursive) +pk_backend_depends_on (PkBackend *backend, PkBackendJob *job, PkBitfield filters, gchar **package_ids, gboolean recursive) { gchar *filters_text; gchar *package_ids_temp; @@ -204,10 +204,10 @@ pk_backend_get_files (PkBackend *backend, PkBackendJob *job, gchar **package_ids } /** - * pk_backend_get_requires: + * pk_backend_required_by: */ void -pk_backend_get_requires (PkBackend *backend, PkBackendJob *job, PkBitfield filters, gchar **package_ids, gboolean recursive) +pk_backend_required_by (PkBackend *backend, PkBackendJob *job, PkBitfield filters, gchar **package_ids, gboolean recursive) { gchar *package_ids_temp; gchar *filters_text; diff --git a/backends/smart/smartBackend.py b/backends/smart/smartBackend.py index 29cee17a7..8695a36b4 100755 --- a/backends/smart/smartBackend.py +++ b/backends/smart/smartBackend.py @@ -836,7 +836,7 @@ def _best_package_from_list(self, package_list): return None @needs_cache - def get_depends(self, filters, packageids, recursive): + def depends_on(self, filters, packageids, recursive): self.status(STATUS_INFO) self.allow_cancel(True) for packageid in packageids: @@ -870,7 +870,7 @@ def get_depends(self, filters, packageids, recursive): self._show_package_list() @needs_cache - def get_requires(self, filters, packageids, recursive): + def required_by(self, filters, packageids, recursive): self.status(STATUS_INFO) self.allow_cancel(True) for packageid in packageids: diff --git a/backends/test/pk-backend-test-fail.c b/backends/test/pk-backend-test-fail.c index ed5e0490e..e53f706d7 100644 --- a/backends/test/pk-backend-test-fail.c +++ b/backends/test/pk-backend-test-fail.c @@ -89,10 +89,10 @@ pk_backend_cancel (PkBackend *backend, PkBackendJob *job) } /** - * pk_backend_get_depends: + * pk_backend_depends_on: */ void -pk_backend_get_depends (PkBackend *backend, PkBackendJob *job, PkBitfield filters, gchar **package_ids, gboolean recursive) +pk_backend_depends_on (PkBackend *backend, PkBackendJob *job, PkBitfield filters, gchar **package_ids, gboolean recursive) { pk_backend_job_finished (job); } @@ -116,10 +116,10 @@ pk_backend_get_files (PkBackend *backend, PkBackendJob *job, gchar **package_ids } /** - * pk_backend_get_requires: + * pk_backend_required_by: */ void -pk_backend_get_requires (PkBackend *backend, PkBackendJob *job, PkBitfield filters, gchar **package_ids, gboolean recursive) +pk_backend_required_by (PkBackend *backend, PkBackendJob *job, PkBitfield filters, gchar **package_ids, gboolean recursive) { pk_backend_job_finished (job); } diff --git a/backends/test/pk-backend-test-succeed.c b/backends/test/pk-backend-test-succeed.c index 33c317811..a1199da9e 100644 --- a/backends/test/pk-backend-test-succeed.c +++ b/backends/test/pk-backend-test-succeed.c @@ -114,10 +114,10 @@ pk_backend_get_categories (PkBackend *backend, PkBackendJob *job) } /** - * pk_backend_get_depends: + * pk_backend_depends_on: */ void -pk_backend_get_depends (PkBackend *backend, PkBackendJob *job, PkBitfield filters, gchar **package_ids, gboolean recursive) +pk_backend_depends_on (PkBackend *backend, PkBackendJob *job, PkBitfield filters, gchar **package_ids, gboolean recursive) { pk_backend_job_finished (job); } @@ -150,10 +150,10 @@ pk_backend_get_files (PkBackend *backend, PkBackendJob *job, gchar **package_ids } /** - * pk_backend_get_requires: + * pk_backend_required_by: */ void -pk_backend_get_requires (PkBackend *backend, PkBackendJob *job, PkBitfield filters, gchar **package_ids, gboolean recursive) +pk_backend_required_by (PkBackend *backend, PkBackendJob *job, PkBitfield filters, gchar **package_ids, gboolean recursive) { pk_backend_job_finished (job); } diff --git a/backends/urpmi/helpers/urpmi-dispatched-backend.pl b/backends/urpmi/helpers/urpmi-dispatched-backend.pl index 94f8b9d80..c4047bb73 100755 --- a/backends/urpmi/helpers/urpmi-dispatched-backend.pl +++ b/backends/urpmi/helpers/urpmi-dispatched-backend.pl @@ -55,7 +55,7 @@ sub dispatch_command { my $command = shift(@$args); if ($command eq "get-depends") { - get_depends($urpm, $args); + depends_on($urpm, $args); } elsif ($command eq "get-details") { get_details($urpm, $args); } elsif ($command eq "get-distro-upgrades") { @@ -67,7 +67,7 @@ sub dispatch_command { } elsif ($command eq "get-repo-list") { get_repo_list($urpm); } elsif ($command eq "get-requires") { - get_requires($urpm, $args); + required_by($urpm, $args); } elsif ($command eq "get-update-detail") { get_update_detail($urpm, $args); } elsif ($command eq "get-updates") { @@ -106,7 +106,7 @@ sub dispatch_command { } else {} } -sub get_depends { +sub depends_on { my ($urpm, $args) = @_; my @filterstab = split(/;/, $args->[0]); @@ -265,7 +265,7 @@ sub get_repo_list { } -sub get_requires { +sub required_by { my ($urpm, $args) = @_; my @filterstab = split(/;/, $args->[0]); diff --git a/backends/urpmi/pk-backend-urpmi.c b/backends/urpmi/pk-backend-urpmi.c index e19ce6a6e..44467234d 100644 --- a/backends/urpmi/pk-backend-urpmi.c +++ b/backends/urpmi/pk-backend-urpmi.c @@ -149,10 +149,10 @@ pk_backend_get_roles (PkBackend *backend) PkBitfield roles; roles = pk_bitfield_from_enums ( PK_ROLE_ENUM_CANCEL, - PK_ROLE_ENUM_GET_DEPENDS, + PK_ROLE_ENUM_DEPENDS_ON, PK_ROLE_ENUM_GET_DETAILS, PK_ROLE_ENUM_GET_FILES, - PK_ROLE_ENUM_GET_REQUIRES, + PK_ROLE_ENUM_REQUIRED_BY, PK_ROLE_ENUM_GET_PACKAGES, PK_ROLE_ENUM_WHAT_PROVIDES, PK_ROLE_ENUM_GET_UPDATES, @@ -240,10 +240,10 @@ pk_backend_get_files (PkBackend *backend, PkBackendJob *job, gchar **package_ids } /** - * pk_backend_get_depends: + * pk_backend_depends_on: */ void -pk_backend_get_depends (PkBackend *backend, PkBackendJob *job, PkBitfield filters, gchar **package_ids, gboolean recursive) +pk_backend_depends_on (PkBackend *backend, PkBackendJob *job, PkBitfield filters, gchar **package_ids, gboolean recursive) { gchar *filters_text; gchar *package_ids_temp; @@ -374,10 +374,10 @@ pk_backend_get_repo_list (PkBackend *backend, PkBackendJob *job, PkBitfield filt } /** - * pk_backend_get_requires: + * pk_backend_required_by: */ void -pk_backend_get_requires (PkBackend *backend, PkBackendJob *job, PkBitfield filters, gchar **package_ids, gboolean recursive) +pk_backend_required_by (PkBackend *backend, PkBackendJob *job, PkBitfield filters, gchar **package_ids, gboolean recursive) { gchar *package_ids_temp; gchar *filters_text; diff --git a/backends/yum/pk-backend-yum.c b/backends/yum/pk-backend-yum.c index 293b5e27b..a5615a3c9 100644 --- a/backends/yum/pk-backend-yum.c +++ b/backends/yum/pk-backend-yum.c @@ -353,10 +353,10 @@ pk_backend_get_roles (PkBackend *backend) PkBitfield roles; roles = pk_bitfield_from_enums ( PK_ROLE_ENUM_CANCEL, - PK_ROLE_ENUM_GET_DEPENDS, + PK_ROLE_ENUM_DEPENDS_ON, PK_ROLE_ENUM_GET_DETAILS, PK_ROLE_ENUM_GET_FILES, - PK_ROLE_ENUM_GET_REQUIRES, + PK_ROLE_ENUM_REQUIRED_BY, PK_ROLE_ENUM_GET_PACKAGES, PK_ROLE_ENUM_WHAT_PROVIDES, PK_ROLE_ENUM_GET_UPDATES, @@ -423,10 +423,10 @@ pk_backend_download_packages (PkBackend *backend, PkBackendJob *job, gchar **pac } /** - * pk_backend_get_depends: + * pk_backend_depends_on: */ void -pk_backend_get_depends (PkBackend *backend, PkBackendJob *job, PkBitfield filters, gchar **package_ids, gboolean recursive) +pk_backend_depends_on (PkBackend *backend, PkBackendJob *job, PkBitfield filters, gchar **package_ids, gboolean recursive) { gchar *filters_text; gchar *package_ids_temp; @@ -471,10 +471,10 @@ pk_backend_get_files (PkBackend *backend, PkBackendJob *job, gchar **package_ids } /** - * pk_backend_get_requires: + * pk_backend_required_by: */ void -pk_backend_get_requires (PkBackend *backend, PkBackendJob *job, PkBitfield filters, gchar **package_ids, gboolean recursive) +pk_backend_required_by (PkBackend *backend, PkBackendJob *job, PkBitfield filters, gchar **package_ids, gboolean recursive) { gchar *package_ids_temp; gchar *filters_text; diff --git a/backends/yum/yumBackend.py b/backends/yum/yumBackend.py index 313b3df5d..259b02bf4 100755 --- a/backends/yum/yumBackend.py +++ b/backends/yum/yumBackend.py @@ -1255,7 +1255,7 @@ def _findPackage(self, package_id): # return first entry return pkgs[0], False - def get_requires(self, filters, package_ids, recursive): + def required_by(self, filters, package_ids, recursive): ''' Print a list of requires for a given package ''' @@ -1535,9 +1535,9 @@ def _get_group_packages(self, grp): self.error(ERROR_INTERNAL_ERROR, _format_str(traceback.format_exc())) return pkgs - def _get_depends_not_installed(self, filters, package_ids, recursive): + def _depends_on_not_installed(self, filters, package_ids, recursive): ''' - Gets the deps that are not installed, optimisation of get_depends + Gets the deps that are not installed, optimisation of depends_on using a yum transaction Returns a list of pkgs. ''' @@ -1623,7 +1623,7 @@ def _get_depends_not_installed(self, filters, package_ids, recursive): return deps_list - def get_depends(self, filters, package_ids, recursive): + def depends_on(self, filters, package_ids, recursive): ''' Print a list of depends for a given package ''' @@ -1642,7 +1642,7 @@ def get_depends(self, filters, package_ids, recursive): # which we can emulate quicker by doing a transaction, but not # executing it if FILTER_NOT_INSTALLED in filters and recursive: - pkgs = self._get_depends_not_installed (filters, package_ids, recursive) + pkgs = self._depends_on_not_installed (filters, package_ids, recursive) pkgfilter.add_available(pkgs) package_list = pkgfilter.get_package_list() self._show_package_list(package_list) diff --git a/backends/zypp/pk-backend-zypp.cpp b/backends/zypp/pk-backend-zypp.cpp index ea06eca1e..0c570370f 100644 --- a/backends/zypp/pk-backend-zypp.cpp +++ b/backends/zypp/pk-backend-zypp.cpp @@ -1709,10 +1709,10 @@ zypp_is_no_solvable (const sat::Solvable &solv) } /** - * backend_get_requires_thread: + * backend_required_by_thread: */ static void -backend_get_requires_thread (PkBackendJob *job, GVariant *params, gpointer user_data) +backend_required_by_thread (PkBackendJob *job, GVariant *params, gpointer user_data) { MIL << endl; @@ -1791,12 +1791,12 @@ backend_get_requires_thread (PkBackendJob *job, GVariant *params, gpointer user_ } /** - * pk_backend_get_requires: + * pk_backend_required_by: */ void -pk_backend_get_requires(PkBackend *backend, PkBackendJob *job, PkBitfield filters, gchar **package_ids, gboolean recursive) +pk_backend_required_by(PkBackend *backend, PkBackendJob *job, PkBitfield filters, gchar **package_ids, gboolean recursive) { - pk_backend_job_thread_create (job, backend_get_requires_thread, NULL, NULL); + pk_backend_job_thread_create (job, backend_required_by_thread, NULL, NULL); } /** @@ -1846,7 +1846,7 @@ pk_backend_get_filters (PkBackend *backend) * clearly often there is no simple answer. */ static void -backend_get_depends_thread (PkBackendJob *job, GVariant *params, gpointer user_data) +backend_depends_on_thread (PkBackendJob *job, GVariant *params, gpointer user_data) { PkBitfield _filters; gchar **package_ids; @@ -1895,7 +1895,7 @@ backend_get_depends_thread (PkBackendJob *job, GVariant *params, gpointer user_d vector pkg_names; for (Capabilities::const_iterator cap = req.begin (); cap != req.end (); ++cap) { - g_debug ("get_depends - capability '%s'", cap->asString().c_str()); + g_debug ("depends_on - capability '%s'", cap->asString().c_str()); if (caps.find (cap->asString ()) != caps.end()) { g_debug ("Interesting ! already have capability '%s'", cap->asString().c_str()); @@ -1984,12 +1984,12 @@ backend_get_depends_thread (PkBackendJob *job, GVariant *params, gpointer user_d } /** - * pk_backend_get_depends: + * pk_backend_depends_on: */ void -pk_backend_get_depends (PkBackend *backend, PkBackendJob *job, PkBitfield filters, gchar **package_ids, gboolean recursive) +pk_backend_depends_on (PkBackend *backend, PkBackendJob *job, PkBitfield filters, gchar **package_ids, gboolean recursive) { - pk_backend_job_thread_create (job, backend_get_depends_thread, NULL, NULL); + pk_backend_job_thread_create (job, backend_depends_on_thread, NULL, NULL); } static void diff --git a/client/pk-console.c b/client/pk-console.c index d23941183..a252bfaa3 100644 --- a/client/pk-console.c +++ b/client/pk-console.c @@ -1298,10 +1298,10 @@ pk_console_update_system (PkConsoleCtx *ctx, GError **error) } /** - * pk_console_get_requires: + * pk_console_required_by: **/ static gboolean -pk_console_get_requires (PkConsoleCtx *ctx, gchar **packages, GError **error) +pk_console_required_by (PkConsoleCtx *ctx, gchar **packages, GError **error) { gboolean ret = TRUE; gchar **package_ids = NULL; @@ -1323,7 +1323,7 @@ pk_console_get_requires (PkConsoleCtx *ctx, gchar **packages, GError **error) } /* do the async action */ - pk_task_get_requires_async (PK_TASK (ctx->task), + pk_task_required_by_async (PK_TASK (ctx->task), ctx->filters, package_ids, TRUE, @@ -1336,10 +1336,10 @@ pk_console_get_requires (PkConsoleCtx *ctx, gchar **packages, GError **error) } /** - * pk_console_get_depends: + * pk_console_depends_on: **/ static gboolean -pk_console_get_depends (PkConsoleCtx *ctx, gchar **packages, GError **error) +pk_console_depends_on (PkConsoleCtx *ctx, gchar **packages, GError **error) { gboolean ret = TRUE; gchar **package_ids = NULL; @@ -1360,7 +1360,7 @@ pk_console_get_depends (PkConsoleCtx *ctx, gchar **packages, GError **error) } /* do the async action */ - pk_task_get_depends_async (PK_TASK (ctx->task), + pk_task_depends_on_async (PK_TASK (ctx->task), ctx->filters, package_ids, FALSE, @@ -1557,9 +1557,9 @@ pk_console_get_summary (PkConsoleCtx *ctx) g_string_append_printf (string, " %s\n", "resolve [package]"); if (pk_bitfield_contain (ctx->roles, PK_ROLE_ENUM_GET_UPDATES)) g_string_append_printf (string, " %s\n", "get-updates"); - if (pk_bitfield_contain (ctx->roles, PK_ROLE_ENUM_GET_DEPENDS)) + if (pk_bitfield_contain (ctx->roles, PK_ROLE_ENUM_DEPENDS_ON)) g_string_append_printf (string, " %s\n", "get-depends [package]"); - if (pk_bitfield_contain (ctx->roles, PK_ROLE_ENUM_GET_REQUIRES)) + if (pk_bitfield_contain (ctx->roles, PK_ROLE_ENUM_REQUIRED_BY)) g_string_append_printf (string, " %s\n", "get-requires [package]"); if (pk_bitfield_contain (ctx->roles, PK_ROLE_ENUM_GET_DETAILS)) g_string_append_printf (string, " %s\n", "get-details [package]"); @@ -2270,7 +2270,7 @@ main (int argc, char *argv[]) ctx->retval = PK_EXIT_CODE_SYNTAX_INVALID; goto out; } - run_mainloop = pk_console_get_depends (ctx, argv + 2, &error); + run_mainloop = pk_console_depends_on (ctx, argv + 2, &error); } else if (strcmp (mode, "get-distro-upgrades") == 0) { pk_client_get_distro_upgrades_async (PK_CLIENT (ctx->task), @@ -2299,7 +2299,7 @@ main (int argc, char *argv[]) ctx->retval = PK_EXIT_CODE_SYNTAX_INVALID; goto out; } - run_mainloop = pk_console_get_requires (ctx, argv + 2, &error); + run_mainloop = pk_console_required_by (ctx, argv + 2, &error); } else if (strcmp (mode, "what-provides") == 0) { if (value == NULL) { diff --git a/contrib/debuginfo-install/pk-debuginfo-install.c b/contrib/debuginfo-install/pk-debuginfo-install.c index 0c0d13263..67fccbdd9 100644 --- a/contrib/debuginfo-install/pk-debuginfo-install.c +++ b/contrib/debuginfo-install/pk-debuginfo-install.c @@ -374,9 +374,9 @@ pk_debuginfo_install_add_deps (PkDebuginfoInstallPrivate *priv, GPtrArray *packa /* get depends for them all, not adding dup's */ package_ids = pk_ptr_array_to_strv (packages_search); - results = pk_client_get_depends (priv->client, pk_bitfield_value (PK_FILTER_ENUM_NONE), package_ids, TRUE, NULL, NULL, NULL, &error_local); + results = pk_client_depends_on (priv->client, pk_bitfield_value (PK_FILTER_ENUM_NONE), package_ids, TRUE, NULL, NULL, NULL, &error_local); if (results == NULL) { - *error = g_error_new (1, 0, "failed to get_depends: %s", error_local->message); + *error = g_error_new (1, 0, "failed to depends_on: %s", error_local->message); g_error_free (error_local); ret = FALSE; goto out; diff --git a/docs/html/pk-matrix.html b/docs/html/pk-matrix.html index 276cc13e5..ac859671d 100644 --- a/docs/html/pk-matrix.html +++ b/docs/html/pk-matrix.html @@ -74,7 +74,7 @@

Feature Matrix

[yes] -GetDepends +DependsOn [yes] [yes] [yes] @@ -182,7 +182,7 @@

Feature Matrix

[yes] -GetRequires +RequiredBy [yes] [yes] [yes] diff --git a/lib/packagekit-glib2/pk-client-sync.c b/lib/packagekit-glib2/pk-client-sync.c index 1a71134ab..425463aaa 100644 --- a/lib/packagekit-glib2/pk-client-sync.c +++ b/lib/packagekit-glib2/pk-client-sync.c @@ -598,7 +598,7 @@ pk_client_get_old_transactions (PkClient *client, guint number, GCancellable *ca } /** - * pk_client_get_depends: + * pk_client_depends_on: * @client: a valid #PkClient instance * @filters: a %PkBitfield such as %PK_FILTER_ENUM_GUI | %PK_FILTER_ENUM_FREE or %PK_FILTER_ENUM_NONE * @package_ids: (array zero-terminated=1): a null terminated array of package_id structures such as "hal;0.0.1;i386;fedora" @@ -618,7 +618,7 @@ pk_client_get_old_transactions (PkClient *client, guint number, GCancellable *ca * Since: 0.5.3 **/ PkResults * -pk_client_get_depends (PkClient *client, PkBitfield filters, gchar **package_ids, gboolean recursive, GCancellable *cancellable, +pk_client_depends_on (PkClient *client, PkBitfield filters, gchar **package_ids, gboolean recursive, GCancellable *cancellable, PkProgressCallback progress_callback, gpointer progress_user_data, GError **error) { PkClientHelper helper; @@ -636,7 +636,7 @@ pk_client_get_depends (PkClient *client, PkBitfield filters, gchar **package_ids g_main_context_push_thread_default (helper.context); /* run async method */ - pk_client_get_depends_async (client, filters, package_ids, recursive, cancellable, progress_callback, progress_user_data, + pk_client_depends_on_async (client, filters, package_ids, recursive, cancellable, progress_callback, progress_user_data, (GAsyncReadyCallback) pk_client_generic_finish_sync, &helper); g_main_loop_run (helper.loop); @@ -706,7 +706,7 @@ pk_client_get_packages (PkClient *client, PkBitfield filters, GCancellable *canc } /** - * pk_client_get_requires: + * pk_client_required_by: * @client: a valid #PkClient instance * @filters: a %PkBitfield such as %PK_FILTER_ENUM_GUI | %PK_FILTER_ENUM_FREE or %PK_FILTER_ENUM_NONE * @package_ids: (array zero-terminated=1): a null terminated array of package_id structures such as "hal;0.0.1;i386;fedora" @@ -726,7 +726,7 @@ pk_client_get_packages (PkClient *client, PkBitfield filters, GCancellable *canc * Since: 0.5.3 **/ PkResults * -pk_client_get_requires (PkClient *client, PkBitfield filters, gchar **package_ids, gboolean recursive, GCancellable *cancellable, +pk_client_required_by (PkClient *client, PkBitfield filters, gchar **package_ids, gboolean recursive, GCancellable *cancellable, PkProgressCallback progress_callback, gpointer progress_user_data, GError **error) { PkClientHelper helper; @@ -744,7 +744,7 @@ pk_client_get_requires (PkClient *client, PkBitfield filters, gchar **package_id g_main_context_push_thread_default (helper.context); /* run async method */ - pk_client_get_requires_async (client, filters, package_ids, recursive, cancellable, progress_callback, progress_user_data, + pk_client_required_by_async (client, filters, package_ids, recursive, cancellable, progress_callback, progress_user_data, (GAsyncReadyCallback) pk_client_generic_finish_sync, &helper); g_main_loop_run (helper.loop); diff --git a/lib/packagekit-glib2/pk-client-sync.h b/lib/packagekit-glib2/pk-client-sync.h index a0bed196a..85bfe99b3 100644 --- a/lib/packagekit-glib2/pk-client-sync.h +++ b/lib/packagekit-glib2/pk-client-sync.h @@ -105,7 +105,7 @@ PkResults *pk_client_get_old_transactions (PkClient *client, gpointer progress_user_data, GError **error); -PkResults *pk_client_get_depends (PkClient *client, +PkResults *pk_client_depends_on (PkClient *client, PkBitfield filters, gchar **package_ids, gboolean recursive, @@ -121,7 +121,7 @@ PkResults *pk_client_get_packages (PkClient *client, gpointer progress_user_data, GError **error); -PkResults *pk_client_get_requires (PkClient *client, +PkResults *pk_client_required_by (PkClient *client, PkBitfield filters, gchar **package_ids, gboolean recursive, diff --git a/lib/packagekit-glib2/pk-client.c b/lib/packagekit-glib2/pk-client.c index cecf90249..e1d1b3604 100644 --- a/lib/packagekit-glib2/pk-client.c +++ b/lib/packagekit-glib2/pk-client.c @@ -1666,8 +1666,8 @@ pk_client_set_hints_cb (GObject *source_object, state->cancellable, pk_client_method_cb, state); - } else if (state->role == PK_ROLE_ENUM_GET_DEPENDS) { - g_dbus_proxy_call (state->proxy, "GetDepends", + } else if (state->role == PK_ROLE_ENUM_DEPENDS_ON) { + g_dbus_proxy_call (state->proxy, "DependsOn", g_variant_new ("(t^a&sb)", state->filters, state->package_ids, @@ -1680,17 +1680,9 @@ pk_client_set_hints_cb (GObject *source_object, g_object_set (state->results, "inputs", g_strv_length (state->package_ids), NULL); - } else if (state->role == PK_ROLE_ENUM_GET_PACKAGES) { - g_dbus_proxy_call (state->proxy, "GetPackages", - g_variant_new ("(t)", - state->filters), - G_DBUS_CALL_FLAGS_NONE, - PK_CLIENT_DBUS_METHOD_TIMEOUT, - state->cancellable, - pk_client_method_cb, - state); - } else if (state->role == PK_ROLE_ENUM_GET_REQUIRES) { - g_dbus_proxy_call (state->proxy, "GetRequires", + + } else if (state->role == PK_ROLE_ENUM_REQUIRED_BY) { + g_dbus_proxy_call (state->proxy, "RequiredBy", g_variant_new ("(t^a&sb)", state->filters, state->package_ids, @@ -1703,6 +1695,15 @@ pk_client_set_hints_cb (GObject *source_object, g_object_set (state->results, "inputs", g_strv_length (state->package_ids), NULL); + } else if (state->role == PK_ROLE_ENUM_GET_PACKAGES) { + g_dbus_proxy_call (state->proxy, "GetPackages", + g_variant_new ("(t)", + state->filters), + G_DBUS_CALL_FLAGS_NONE, + PK_CLIENT_DBUS_METHOD_TIMEOUT, + state->cancellable, + pk_client_method_cb, + state); } else if (state->role == PK_ROLE_ENUM_WHAT_PROVIDES) { g_dbus_proxy_call (state->proxy, "WhatProvides", g_variant_new ("(t^a&s)", @@ -2852,7 +2853,7 @@ pk_client_get_old_transactions_async (PkClient *client, guint number, GCancellab } /** - * pk_client_get_depends_async: + * pk_client_depends_on_async: * @client: a valid #PkClient instance * @filters: a %PkBitfield such as %PK_FILTER_ENUM_GUI | %PK_FILTER_ENUM_FREE or %PK_FILTER_ENUM_NONE * @package_ids: (array zero-terminated=1): a null terminated array of package_id structures such as "hal;0.0.1;i386;fedora" @@ -2868,7 +2869,7 @@ pk_client_get_old_transactions_async (PkClient *client, guint number, GCancellab * Since: 0.5.2 **/ void -pk_client_get_depends_async (PkClient *client, PkBitfield filters, gchar **package_ids, gboolean recursive, GCancellable *cancellable, +pk_client_depends_on_async (PkClient *client, PkBitfield filters, gchar **package_ids, gboolean recursive, GCancellable *cancellable, PkProgressCallback progress_callback, gpointer progress_user_data, GAsyncReadyCallback callback_ready, gpointer user_data) { @@ -2881,11 +2882,11 @@ pk_client_get_depends_async (PkClient *client, PkBitfield filters, gchar **packa g_return_if_fail (cancellable == NULL || G_IS_CANCELLABLE (cancellable)); g_return_if_fail (package_ids != NULL); - res = g_simple_async_result_new (G_OBJECT (client), callback_ready, user_data, pk_client_get_depends_async); + res = g_simple_async_result_new (G_OBJECT (client), callback_ready, user_data, pk_client_depends_on_async); /* save state */ state = g_slice_new0 (PkClientState); - state->role = PK_ROLE_ENUM_GET_DEPENDS; + state->role = PK_ROLE_ENUM_DEPENDS_ON; state->res = g_object_ref (res); state->client = g_object_ref (client); state->cancellable = g_cancellable_new (); @@ -2991,7 +2992,7 @@ pk_client_get_packages_async (PkClient *client, PkBitfield filters, GCancellable } /** - * pk_client_get_requires_async: + * pk_client_required_by_async: * @client: a valid #PkClient instance * @filters: a %PkBitfield such as %PK_FILTER_ENUM_GUI | %PK_FILTER_ENUM_FREE or %PK_FILTER_ENUM_NONE * @package_ids: (array zero-terminated=1): a null terminated array of package_id structures such as "hal;0.0.1;i386;fedora" @@ -3007,7 +3008,7 @@ pk_client_get_packages_async (PkClient *client, PkBitfield filters, GCancellable * Since: 0.5.2 **/ void -pk_client_get_requires_async (PkClient *client, PkBitfield filters, gchar **package_ids, gboolean recursive, GCancellable *cancellable, +pk_client_required_by_async (PkClient *client, PkBitfield filters, gchar **package_ids, gboolean recursive, GCancellable *cancellable, PkProgressCallback progress_callback, gpointer progress_user_data, GAsyncReadyCallback callback_ready, gpointer user_data) { @@ -3020,11 +3021,11 @@ pk_client_get_requires_async (PkClient *client, PkBitfield filters, gchar **pack g_return_if_fail (cancellable == NULL || G_IS_CANCELLABLE (cancellable)); g_return_if_fail (package_ids != NULL); - res = g_simple_async_result_new (G_OBJECT (client), callback_ready, user_data, pk_client_get_requires_async); + res = g_simple_async_result_new (G_OBJECT (client), callback_ready, user_data, pk_client_required_by_async); /* save state */ state = g_slice_new0 (PkClientState); - state->role = PK_ROLE_ENUM_GET_REQUIRES; + state->role = PK_ROLE_ENUM_REQUIRED_BY; state->res = g_object_ref (res); state->client = g_object_ref (client); state->cancellable = g_cancellable_new (); diff --git a/lib/packagekit-glib2/pk-client.h b/lib/packagekit-glib2/pk-client.h index 6c6160a89..466a3f9c9 100644 --- a/lib/packagekit-glib2/pk-client.h +++ b/lib/packagekit-glib2/pk-client.h @@ -194,7 +194,7 @@ void pk_client_get_old_transactions_async (PkClient *client, GAsyncReadyCallback callback_ready, gpointer user_data); -void pk_client_get_depends_async (PkClient *client, +void pk_client_depends_on_async (PkClient *client, PkBitfield filters, gchar **package_ids, gboolean recursive, @@ -212,7 +212,7 @@ void pk_client_get_packages_async (PkClient *client, GAsyncReadyCallback callback_ready, gpointer user_data); -void pk_client_get_requires_async (PkClient *client, +void pk_client_required_by_async (PkClient *client, PkBitfield filters, gchar **package_ids, gboolean recursive, diff --git a/lib/packagekit-glib2/pk-enum.c b/lib/packagekit-glib2/pk-enum.c index 809da952f..6ee3e2165 100644 --- a/lib/packagekit-glib2/pk-enum.c +++ b/lib/packagekit-glib2/pk-enum.c @@ -94,12 +94,12 @@ static const PkEnumMatch enum_status[] = { static const PkEnumMatch enum_role[] = { {PK_ROLE_ENUM_UNKNOWN, "unknown"}, /* fall though value */ {PK_ROLE_ENUM_CANCEL, "cancel"}, - {PK_ROLE_ENUM_GET_DEPENDS, "get-depends"}, + {PK_ROLE_ENUM_DEPENDS_ON, "get-depends"}, {PK_ROLE_ENUM_GET_DETAILS, "get-details"}, {PK_ROLE_ENUM_GET_FILES, "get-files"}, {PK_ROLE_ENUM_GET_PACKAGES, "get-packages"}, {PK_ROLE_ENUM_GET_REPO_LIST, "get-repo-list"}, - {PK_ROLE_ENUM_GET_REQUIRES, "get-requires"}, + {PK_ROLE_ENUM_REQUIRED_BY, "get-requires"}, {PK_ROLE_ENUM_GET_UPDATE_DETAIL, "get-update-detail"}, {PK_ROLE_ENUM_GET_UPDATES, "get-updates"}, {PK_ROLE_ENUM_INSTALL_FILES, "install-files"}, @@ -1114,7 +1114,7 @@ pk_role_enum_to_localised_present (PkRoleEnum role) /* TRANSLATORS: The role of the transaction, in present tense */ text = dgettext("PackageKit", "Unknown role type"); break; - case PK_ROLE_ENUM_GET_DEPENDS: + case PK_ROLE_ENUM_DEPENDS_ON: /* TRANSLATORS: The role of the transaction, in present tense */ text = dgettext("PackageKit", "Getting dependencies"); break; @@ -1126,7 +1126,7 @@ pk_role_enum_to_localised_present (PkRoleEnum role) /* TRANSLATORS: The role of the transaction, in present tense */ text = dgettext("PackageKit", "Getting details"); break; - case PK_ROLE_ENUM_GET_REQUIRES: + case PK_ROLE_ENUM_REQUIRED_BY: /* TRANSLATORS: The role of the transaction, in present tense */ text = dgettext("PackageKit", "Getting requires"); break; diff --git a/lib/packagekit-glib2/pk-enum.h b/lib/packagekit-glib2/pk-enum.h index d27f5cce5..f6482f5d7 100644 --- a/lib/packagekit-glib2/pk-enum.h +++ b/lib/packagekit-glib2/pk-enum.h @@ -51,12 +51,12 @@ typedef struct { typedef enum { PK_ROLE_ENUM_UNKNOWN, PK_ROLE_ENUM_CANCEL, - PK_ROLE_ENUM_GET_DEPENDS, + PK_ROLE_ENUM_DEPENDS_ON, PK_ROLE_ENUM_GET_DETAILS, PK_ROLE_ENUM_GET_FILES, PK_ROLE_ENUM_GET_PACKAGES, PK_ROLE_ENUM_GET_REPO_LIST, - PK_ROLE_ENUM_GET_REQUIRES, + PK_ROLE_ENUM_REQUIRED_BY, PK_ROLE_ENUM_GET_UPDATE_DETAIL, PK_ROLE_ENUM_GET_UPDATES, PK_ROLE_ENUM_INSTALL_FILES, diff --git a/lib/packagekit-glib2/pk-task-sync.c b/lib/packagekit-glib2/pk-task-sync.c index 01bbb8762..ac298c43b 100644 --- a/lib/packagekit-glib2/pk-task-sync.c +++ b/lib/packagekit-glib2/pk-task-sync.c @@ -671,7 +671,7 @@ pk_task_get_updates_sync (PkTask *task, PkBitfield filters, GCancellable *cancel } /** - * pk_task_get_depends_sync: + * pk_task_depends_on_sync: * @task: a valid #PkTask instance * @filters: a bitfield of filters that can be used to limit the results * @package_ids: (array zero-terminated=1): a null terminated array of package_id structures such as "hal;0.0.1;i386;fedora" @@ -688,7 +688,7 @@ pk_task_get_updates_sync (PkTask *task, PkBitfield filters, GCancellable *cancel * Since: 0.6.5 **/ PkResults * -pk_task_get_depends_sync (PkTask *task, PkBitfield filters, gchar **package_ids, gboolean recursive, GCancellable *cancellable, +pk_task_depends_on_sync (PkTask *task, PkBitfield filters, gchar **package_ids, gboolean recursive, GCancellable *cancellable, PkProgressCallback progress_callback, gpointer progress_user_data, GError **error) { @@ -704,7 +704,7 @@ pk_task_get_depends_sync (PkTask *task, PkBitfield filters, gchar **package_ids, helper->error = error; /* run async method */ - pk_task_get_depends_async (task, filters, package_ids, recursive, cancellable, progress_callback, progress_user_data, + pk_task_depends_on_async (task, filters, package_ids, recursive, cancellable, progress_callback, progress_user_data, (GAsyncReadyCallback) pk_task_generic_finish_sync, helper); g_main_loop_run (helper->loop); @@ -765,7 +765,7 @@ pk_task_get_packages_sync (PkTask *task, PkBitfield filters, GCancellable *cance } /** - * pk_task_get_requires_sync: + * pk_task_required_by_sync: * @task: a valid #PkTask instance * @filters: a bitfield of filters that can be used to limit the results * @package_ids: (array zero-terminated=1): a null terminated array of package_id structures such as "hal;0.0.1;i386;fedora" @@ -782,7 +782,7 @@ pk_task_get_packages_sync (PkTask *task, PkBitfield filters, GCancellable *cance * Since: 0.6.5 **/ PkResults * -pk_task_get_requires_sync (PkTask *task, PkBitfield filters, gchar **package_ids, gboolean recursive, GCancellable *cancellable, +pk_task_required_by_sync (PkTask *task, PkBitfield filters, gchar **package_ids, gboolean recursive, GCancellable *cancellable, PkProgressCallback progress_callback, gpointer progress_user_data, GError **error) { @@ -798,7 +798,7 @@ pk_task_get_requires_sync (PkTask *task, PkBitfield filters, gchar **package_ids helper->error = error; /* run async method */ - pk_task_get_requires_async (task, filters, package_ids, recursive, cancellable, progress_callback, progress_user_data, + pk_task_required_by_async (task, filters, package_ids, recursive, cancellable, progress_callback, progress_user_data, (GAsyncReadyCallback) pk_task_generic_finish_sync, helper); g_main_loop_run (helper->loop); diff --git a/lib/packagekit-glib2/pk-task-sync.h b/lib/packagekit-glib2/pk-task-sync.h index 3a23c09cb..82c30d838 100644 --- a/lib/packagekit-glib2/pk-task-sync.h +++ b/lib/packagekit-glib2/pk-task-sync.h @@ -132,7 +132,7 @@ PkResults *pk_task_get_updates_sync (PkTask *task, gpointer progress_user_data, GError **error); -PkResults *pk_task_get_depends_sync (PkTask *task, +PkResults *pk_task_depends_on_sync (PkTask *task, PkBitfield filters, gchar **package_ids, gboolean recursive, @@ -148,7 +148,7 @@ PkResults *pk_task_get_packages_sync (PkTask *task, gpointer progress_user_data, GError **error); -PkResults *pk_task_get_requires_sync (PkTask *task, +PkResults *pk_task_required_by_sync (PkTask *task, PkBitfield filters, gchar **package_ids, gboolean recursive, diff --git a/lib/packagekit-glib2/pk-task.c b/lib/packagekit-glib2/pk-task.c index bce79ef5a..d81944dcf 100644 --- a/lib/packagekit-glib2/pk-task.c +++ b/lib/packagekit-glib2/pk-task.c @@ -250,16 +250,16 @@ pk_task_do_async_action (PkTaskState *state) pk_client_get_updates_async (PK_CLIENT(state->task), state->filters, state->cancellable, state->progress_callback, state->progress_user_data, (GAsyncReadyCallback) pk_task_ready_cb, state); - } else if (state->role == PK_ROLE_ENUM_GET_DEPENDS) { - pk_client_get_depends_async (PK_CLIENT(state->task), state->filters, state->package_ids, state->recursive, + } else if (state->role == PK_ROLE_ENUM_DEPENDS_ON) { + pk_client_depends_on_async (PK_CLIENT(state->task), state->filters, state->package_ids, state->recursive, state->cancellable, state->progress_callback, state->progress_user_data, (GAsyncReadyCallback) pk_task_ready_cb, state); } else if (state->role == PK_ROLE_ENUM_GET_PACKAGES) { pk_client_get_packages_async (PK_CLIENT(state->task), state->filters, state->cancellable, state->progress_callback, state->progress_user_data, (GAsyncReadyCallback) pk_task_ready_cb, state); - } else if (state->role == PK_ROLE_ENUM_GET_REQUIRES) { - pk_client_get_requires_async (PK_CLIENT(state->task), state->filters, state->package_ids, state->recursive, + } else if (state->role == PK_ROLE_ENUM_REQUIRED_BY) { + pk_client_required_by_async (PK_CLIENT(state->task), state->filters, state->package_ids, state->recursive, state->cancellable, state->progress_callback, state->progress_user_data, (GAsyncReadyCallback) pk_task_ready_cb, state); } else if (state->role == PK_ROLE_ENUM_WHAT_PROVIDES) { @@ -1740,7 +1740,7 @@ pk_task_get_updates_async (PkTask *task, PkBitfield filters, GCancellable *cance } /** - * pk_task_get_depends_async: + * pk_task_depends_on_async: * @task: a valid #PkTask instance * @filters: a bitfield of filters that can be used to limit the results * @package_ids: (array zero-terminated=1): a null terminated array of package_id structures such as "hal;0.0.1;i386;fedora" @@ -1756,7 +1756,7 @@ pk_task_get_updates_async (PkTask *task, PkBitfield filters, GCancellable *cance * Since: 0.6.5 **/ void -pk_task_get_depends_async (PkTask *task, PkBitfield filters, gchar **package_ids, gboolean recursive, GCancellable *cancellable, +pk_task_depends_on_async (PkTask *task, PkBitfield filters, gchar **package_ids, gboolean recursive, GCancellable *cancellable, PkProgressCallback progress_callback, gpointer progress_user_data, GAsyncReadyCallback callback_ready, gpointer user_data) { @@ -1771,7 +1771,7 @@ pk_task_get_depends_async (PkTask *task, PkBitfield filters, gchar **package_ids /* save state */ state = g_slice_new0 (PkTaskState); - state->role = PK_ROLE_ENUM_GET_DEPENDS; + state->role = PK_ROLE_ENUM_DEPENDS_ON; state->res = g_object_ref (res); state->task = g_object_ref (task); if (cancellable != NULL) @@ -1846,7 +1846,7 @@ pk_task_get_packages_async (PkTask *task, PkBitfield filters, GCancellable *canc } /** - * pk_task_get_requires_async: + * pk_task_required_by_async: * @task: a valid #PkTask instance * @filters: a bitfield of filters that can be used to limit the results * @package_ids: (array zero-terminated=1): a null terminated array of package_id structures such as "hal;0.0.1;i386;fedora" @@ -1862,7 +1862,7 @@ pk_task_get_packages_async (PkTask *task, PkBitfield filters, GCancellable *canc * Since: 0.6.5 **/ void -pk_task_get_requires_async (PkTask *task, PkBitfield filters, gchar **package_ids, gboolean recursive, GCancellable *cancellable, +pk_task_required_by_async (PkTask *task, PkBitfield filters, gchar **package_ids, gboolean recursive, GCancellable *cancellable, PkProgressCallback progress_callback, gpointer progress_user_data, GAsyncReadyCallback callback_ready, gpointer user_data) { @@ -1877,7 +1877,7 @@ pk_task_get_requires_async (PkTask *task, PkBitfield filters, gchar **package_id /* save state */ state = g_slice_new0 (PkTaskState); - state->role = PK_ROLE_ENUM_GET_REQUIRES; + state->role = PK_ROLE_ENUM_REQUIRED_BY; state->res = g_object_ref (res); state->task = g_object_ref (task); if (cancellable != NULL) diff --git a/lib/packagekit-glib2/pk-task.h b/lib/packagekit-glib2/pk-task.h index ae10da7ff..d32007541 100644 --- a/lib/packagekit-glib2/pk-task.h +++ b/lib/packagekit-glib2/pk-task.h @@ -188,7 +188,7 @@ void pk_task_get_updates_async (PkTask *task, gpointer progress_user_data, GAsyncReadyCallback callback_ready, gpointer user_data); -void pk_task_get_depends_async (PkTask *task, +void pk_task_depends_on_async (PkTask *task, PkBitfield filters, gchar **package_ids, gboolean recursive, @@ -204,7 +204,7 @@ void pk_task_get_packages_async (PkTask *task, gpointer progress_user_data, GAsyncReadyCallback callback_ready, gpointer user_data); -void pk_task_get_requires_async (PkTask *task, +void pk_task_required_by_async (PkTask *task, PkBitfield filters, gchar **package_ids, gboolean recursive, diff --git a/lib/python/packagekit/backend.py b/lib/python/packagekit/backend.py index 13a09cd7e..198457728 100644 --- a/lib/python/packagekit/backend.py +++ b/lib/python/packagekit/backend.py @@ -374,7 +374,7 @@ def get_update_detail(self, package_ids): ''' self.error(ERROR_NOT_SUPPORTED, "This function is not implemented in this backend", exit=False) - def get_depends(self, filters, package_ids, recursive): + def depends_on(self, filters, package_ids, recursive): ''' Implement the {backend}-get-depends functionality Needed to be implemented in a sub class @@ -388,7 +388,7 @@ def get_packages(self, filters): ''' self.error(ERROR_NOT_SUPPORTED, "This function is not implemented in this backend", exit=False) - def get_requires(self, filters, package_ids, recursive): + def required_by(self, filters, package_ids, recursive): ''' Implement the {backend}-get-requires functionality Needed to be implemented in a sub class @@ -567,7 +567,7 @@ def dispatch_command(self, cmd, args): filters = args[0].split(';') package_ids = args[1].split(PACKAGE_IDS_DELIM) recursive = _text_to_bool(args[2]) - self.get_depends(filters, package_ids, recursive) + self.depends_on(filters, package_ids, recursive) self.finished() elif cmd == 'get-details': package_ids = args[0].split(PACKAGE_IDS_DELIM) @@ -589,7 +589,7 @@ def dispatch_command(self, cmd, args): filters = args[0].split(';') package_ids = args[1].split(PACKAGE_IDS_DELIM) recursive = _text_to_bool(args[2]) - self.get_requires(filters, package_ids, recursive) + self.required_by(filters, package_ids, recursive) self.finished() elif cmd == 'get-update-detail': package_ids = args[0].split(PACKAGE_IDS_DELIM) diff --git a/src/org.freedesktop.PackageKit.Transaction.xml b/src/org.freedesktop.PackageKit.Transaction.xml index 1fd335f23..a760b7fcf 100644 --- a/src/org.freedesktop.PackageKit.Transaction.xml +++ b/src/org.freedesktop.PackageKit.Transaction.xml @@ -316,7 +316,7 @@ - + @@ -361,7 +361,7 @@ Either true or false. If yes then the requirements should be returned for all packages returned. This means if gnome-power-manager depends on NetworkManager - and NetworkManager depends on HAL, then GetDepends on + and NetworkManager depends on HAL, then DependsOn on gnome-power-manager should return both HAL and NetworkManager. @@ -502,7 +502,7 @@ - + @@ -722,7 +722,7 @@ The installer should always install extra packages automatically - as the use could call GetDepends prior to the install if a confirmation + as the use could call DependsOn prior to the install if a confirmation is required in the UI. diff --git a/src/pk-backend.c b/src/pk-backend.c index a53baa37c..48d8ffe0c 100644 --- a/src/pk-backend.c +++ b/src/pk-backend.c @@ -79,7 +79,7 @@ typedef struct { const gchar *directory); void (*get_categories) (PkBackend *backend, PkBackendJob *job); - void (*get_depends) (PkBackend *backend, + void (*depends_on) (PkBackend *backend, PkBackendJob *job, PkBitfield filters, gchar **package_ids, @@ -98,7 +98,7 @@ typedef struct { void (*get_repo_list) (PkBackend *backend, PkBackendJob *job, PkBitfield filters); - void (*get_requires) (PkBackend *backend, + void (*required_by) (PkBackend *backend, PkBackendJob *job, PkBitfield filters, gchar **package_ids, @@ -320,14 +320,14 @@ pk_backend_get_roles (PkBackend *backend) desc = backend->priv->desc; if (desc->cancel != NULL) pk_bitfield_add (roles, PK_ROLE_ENUM_CANCEL); - if (desc->get_depends != NULL) - pk_bitfield_add (roles, PK_ROLE_ENUM_GET_DEPENDS); + if (desc->depends_on != NULL) + pk_bitfield_add (roles, PK_ROLE_ENUM_DEPENDS_ON); if (desc->get_details != NULL) pk_bitfield_add (roles, PK_ROLE_ENUM_GET_DETAILS); if (desc->get_files != NULL) pk_bitfield_add (roles, PK_ROLE_ENUM_GET_FILES); - if (desc->get_requires != NULL) - pk_bitfield_add (roles, PK_ROLE_ENUM_GET_REQUIRES); + if (desc->required_by != NULL) + pk_bitfield_add (roles, PK_ROLE_ENUM_REQUIRED_BY); if (desc->get_packages != NULL) pk_bitfield_add (roles, PK_ROLE_ENUM_GET_PACKAGES); if (desc->what_provides != NULL) @@ -493,7 +493,7 @@ pk_backend_load (PkBackend *backend, GError **error) g_module_symbol (handle, "pk_backend_destroy", (gpointer *)&desc->destroy); g_module_symbol (handle, "pk_backend_download_packages", (gpointer *)&desc->download_packages); g_module_symbol (handle, "pk_backend_get_categories", (gpointer *)&desc->get_categories); - g_module_symbol (handle, "pk_backend_get_depends", (gpointer *)&desc->get_depends); + g_module_symbol (handle, "pk_backend_depends_on", (gpointer *)&desc->depends_on); g_module_symbol (handle, "pk_backend_get_details", (gpointer *)&desc->get_details); g_module_symbol (handle, "pk_backend_get_distro_upgrades", (gpointer *)&desc->get_distro_upgrades); g_module_symbol (handle, "pk_backend_get_files", (gpointer *)&desc->get_files); @@ -503,7 +503,7 @@ pk_backend_load (PkBackend *backend, GError **error) g_module_symbol (handle, "pk_backend_supports_parallelization", (gpointer *)&desc->supports_parallelization); g_module_symbol (handle, "pk_backend_get_packages", (gpointer *)&desc->get_packages); g_module_symbol (handle, "pk_backend_get_repo_list", (gpointer *)&desc->get_repo_list); - g_module_symbol (handle, "pk_backend_get_requires", (gpointer *)&desc->get_requires); + g_module_symbol (handle, "pk_backend_required_by", (gpointer *)&desc->required_by); g_module_symbol (handle, "pk_backend_get_roles", (gpointer *)&desc->get_roles); g_module_symbol (handle, "pk_backend_get_provides", (gpointer *)&desc->get_provides); g_module_symbol (handle, "pk_backend_get_update_detail", (gpointer *)&desc->get_update_detail); @@ -997,27 +997,27 @@ pk_backend_get_categories (PkBackend *backend, PkBackendJob *job) } /** - * pk_backend_get_depends: + * pk_backend_depends_on: */ void -pk_backend_get_depends (PkBackend *backend, +pk_backend_depends_on (PkBackend *backend, PkBackendJob *job, PkBitfield filters, gchar **package_ids, gboolean recursive) { g_return_if_fail (PK_IS_BACKEND (backend)); - g_return_if_fail (backend->priv->desc->get_depends != NULL); + g_return_if_fail (backend->priv->desc->depends_on != NULL); /* final pre-flight checks */ g_assert (pk_backend_job_get_vfunc_enabled (job, PK_BACKEND_SIGNAL_FINISHED)); - pk_backend_job_set_role (job, PK_ROLE_ENUM_GET_DEPENDS); + pk_backend_job_set_role (job, PK_ROLE_ENUM_DEPENDS_ON); pk_backend_job_set_parameters (job, g_variant_new ("(t^asb)", filters, package_ids, recursive)); - backend->priv->desc->get_depends (backend, job, filters, package_ids, recursive); + backend->priv->desc->depends_on (backend, job, filters, package_ids, recursive); } /** @@ -1077,27 +1077,27 @@ pk_backend_get_files (PkBackend *backend, } /** - * pk_backend_get_requires: + * pk_backend_required_by: */ void -pk_backend_get_requires (PkBackend *backend, +pk_backend_required_by (PkBackend *backend, PkBackendJob *job, PkBitfield filters, gchar **package_ids, gboolean recursive) { g_return_if_fail (PK_IS_BACKEND (backend)); - g_return_if_fail (backend->priv->desc->get_requires != NULL); + g_return_if_fail (backend->priv->desc->required_by != NULL); /* final pre-flight checks */ g_assert (pk_backend_job_get_vfunc_enabled (job, PK_BACKEND_SIGNAL_FINISHED)); - pk_backend_job_set_role (job, PK_ROLE_ENUM_GET_REQUIRES); + pk_backend_job_set_role (job, PK_ROLE_ENUM_REQUIRED_BY); pk_backend_job_set_parameters (job, g_variant_new ("(t^asb)", filters, package_ids, recursive)); - backend->priv->desc->get_requires (backend, job, filters, package_ids, recursive); + backend->priv->desc->required_by (backend, job, filters, package_ids, recursive); } /** diff --git a/src/pk-backend.h b/src/pk-backend.h index df8eb1fbd..20a308c53 100644 --- a/src/pk-backend.h +++ b/src/pk-backend.h @@ -121,7 +121,7 @@ void pk_backend_download_packages (PkBackend *backend, const gchar *directory); void pk_backend_get_categories (PkBackend *backend, PkBackendJob *job); -void pk_backend_get_depends (PkBackend *backend, +void pk_backend_depends_on (PkBackend *backend, PkBackendJob *job, PkBitfield filters, gchar **package_ids, @@ -134,7 +134,7 @@ void pk_backend_get_distro_upgrades (PkBackend *backend, void pk_backend_get_files (PkBackend *backend, PkBackendJob *job, gchar **package_ids); -void pk_backend_get_requires (PkBackend *backend, +void pk_backend_required_by (PkBackend *backend, PkBackendJob *job, PkBitfield filters, gchar **package_ids, diff --git a/src/pk-transaction.c b/src/pk-transaction.c index 21a02a322..9e27e994d 100644 --- a/src/pk-transaction.c +++ b/src/pk-transaction.c @@ -2073,8 +2073,8 @@ pk_transaction_run (PkTransaction *transaction) /* do the correct action with the cached parameters */ switch (priv->role) { - case PK_ROLE_ENUM_GET_DEPENDS: - pk_backend_get_depends (priv->backend, + case PK_ROLE_ENUM_DEPENDS_ON: + pk_backend_depends_on (priv->backend, priv->job, priv->cached_filters, priv->cached_package_ids, @@ -2111,8 +2111,8 @@ pk_transaction_run (PkTransaction *transaction) priv->job, priv->cached_package_ids); break; - case PK_ROLE_ENUM_GET_REQUIRES: - pk_backend_get_requires (priv->backend, + case PK_ROLE_ENUM_REQUIRED_BY: + pk_backend_required_by (priv->backend, priv->job, priv->cached_filters, priv->cached_package_ids, @@ -3280,10 +3280,10 @@ pk_transaction_get_categories (PkTransaction *transaction, } /** - * pk_transaction_get_depends: + * pk_transaction_depends_on: **/ static void -pk_transaction_get_depends (PkTransaction *transaction, +pk_transaction_depends_on (PkTransaction *transaction, GVariant *params, GDBusMethodInvocation *context) { @@ -3305,13 +3305,13 @@ pk_transaction_get_depends (PkTransaction *transaction, &recursive); package_ids_temp = pk_package_ids_to_string (package_ids); - g_debug ("GetDepends method called: %s (recursive %i)", package_ids_temp, recursive); + g_debug ("DependsOn method called: %s (recursive %i)", package_ids_temp, recursive); /* not implemented yet */ if (!pk_backend_is_implemented (transaction->priv->backend, - PK_ROLE_ENUM_GET_DEPENDS)) { + PK_ROLE_ENUM_DEPENDS_ON)) { error = g_error_new (PK_TRANSACTION_ERROR, PK_TRANSACTION_ERROR_NOT_SUPPORTED, - "GetDepends not supported by backend"); + "DependsOn not supported by backend"); pk_transaction_release_tid (transaction); goto out; } @@ -3339,7 +3339,7 @@ pk_transaction_get_depends (PkTransaction *transaction, transaction->priv->cached_filters = filter; transaction->priv->cached_package_ids = g_strdupv (package_ids); transaction->priv->cached_force = recursive; - pk_transaction_set_role (transaction, PK_ROLE_ENUM_GET_DEPENDS); + pk_transaction_set_role (transaction, PK_ROLE_ENUM_DEPENDS_ON); /* try to commit this */ ret = pk_transaction_commit (transaction); @@ -3702,10 +3702,10 @@ pk_transaction_get_repo_list (PkTransaction *transaction, } /** - * pk_transaction_get_requires: + * pk_transaction_required_by: **/ static void -pk_transaction_get_requires (PkTransaction *transaction, +pk_transaction_required_by (PkTransaction *transaction, GVariant *params, GDBusMethodInvocation *context) { @@ -3727,13 +3727,13 @@ pk_transaction_get_requires (PkTransaction *transaction, &recursive); package_ids_temp = pk_package_ids_to_string (package_ids); - g_debug ("GetRequires method called: %s (recursive %i)", package_ids_temp, recursive); + g_debug ("RequiredBy method called: %s (recursive %i)", package_ids_temp, recursive); /* not implemented yet */ if (!pk_backend_is_implemented (transaction->priv->backend, - PK_ROLE_ENUM_GET_REQUIRES)) { + PK_ROLE_ENUM_REQUIRED_BY)) { error = g_error_new (PK_TRANSACTION_ERROR, PK_TRANSACTION_ERROR_NOT_SUPPORTED, - "GetRequires not supported by backend"); + "RequiredBy not supported by backend"); pk_transaction_release_tid (transaction); goto out; } @@ -3761,7 +3761,7 @@ pk_transaction_get_requires (PkTransaction *transaction, transaction->priv->cached_filters = filter; transaction->priv->cached_package_ids = g_strdupv (package_ids); transaction->priv->cached_force = recursive; - pk_transaction_set_role (transaction, PK_ROLE_ENUM_GET_REQUIRES); + pk_transaction_set_role (transaction, PK_ROLE_ENUM_REQUIRED_BY); /* try to commit this */ ret = pk_transaction_commit (transaction); @@ -5253,8 +5253,8 @@ pk_transaction_method_call (GDBusConnection *connection_, const gchar *sender, goto out; } - if (g_strcmp0 (method_name, "GetDepends") == 0) { - pk_transaction_get_depends (transaction, parameters, invocation); + if (g_strcmp0 (method_name, "DependsOn") == 0) { + pk_transaction_depends_on (transaction, parameters, invocation); goto out; } @@ -5283,8 +5283,8 @@ pk_transaction_method_call (GDBusConnection *connection_, const gchar *sender, goto out; } - if (g_strcmp0 (method_name, "GetRequires") == 0) { - pk_transaction_get_requires (transaction, parameters, invocation); + if (g_strcmp0 (method_name, "RequiredBy") == 0) { + pk_transaction_required_by (transaction, parameters, invocation); goto out; }