Skip to content

Commit

Permalink
Rename GetDepends and GetRequires to DependsOn and RequiredBy
Browse files Browse the repository at this point in the history 
This change should make the purpose of these functions really obvious to
anyone and avoids the confusion we had with GetRequires in the past.
  • Loading branch information
@ximion
ximion committed Dec 20, 2013
1 parent 437c905 commit e590ed9
Show file tree
Hide file tree
Showing 43 changed files with 242 additions and 243 deletions.
14 changes: 7 additions & 7 deletions backends/alpm/pk-backend-depends.c
View file
Expand Up @@ -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;
Expand Down Expand Up @@ -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;

Expand All @@ -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;
Expand Down Expand Up @@ -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);
}
4 changes: 2 additions & 2 deletions backends/apt/aptBackend.py
View file
Expand Up @@ -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.
Expand Down Expand Up @@ -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.
Expand Down
8 changes: 4 additions & 4 deletions backends/apt/pk-backend-apt.c
View file
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
20 changes: 10 additions & 10 deletions backends/aptcc/pk-backend-aptcc.cpp
View file
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand All @@ -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);
}

/**
Expand Down Expand Up @@ -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,
Expand Down
8 changes: 4 additions & 4 deletions backends/dummy/pk-backend-dummy.c
View file
Expand Up @@ -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);

Expand Down Expand Up @@ -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,
Expand Down
28 changes: 13 additions & 15 deletions backends/entropy/entropyBackend.py
View file
Expand Up @@ -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)
Expand All @@ -1036,19 +1035,19 @@ 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
repo = self._get_repo_name(repo_db)
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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand All @@ -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
Expand All @@ -1327,21 +1325,21 @@ 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
deep = False
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
Expand Down
12 changes: 6 additions & 6 deletions backends/entropy/pk-backend-entropy.c
View file
Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion backends/hawkey/hif-package.c
View file
Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions backends/pisi/pisiBackend.py
View file
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
8 changes: 4 additions & 4 deletions backends/pisi/pk-backend-pisi.c
View file
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit e590ed9

Please sign in to comment.