Evolinx/packagekit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

alpm: fix mixed declarations and code

Browse Source
This commit is contained in:
Christian Hesse 2024-09-10 14:34:07 +02:00 committed by Martin Valba
parent bf9eb9cb56
commit 296c61f689
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
backends/alpm/pk-alpm-sync.c
View File

@ -44,6 +44,7 @@ pk_alpm_transaction_sync_targets (PkBackendJob *job, const gchar **packages, gbo
g_auto(GStrv) package = pk_package_id_split (*packages);
gchar *repo = package[PK_PACKAGE_ID_DATA];
gchar *name = package[PK_PACKAGE_ID_NAME];
alpm_pkg_t *dep_to_remove;
const alpm_list_t *i = alpm_get_syncdbs (priv->alpm);
alpm_pkg_t *pkg;
@ -61,7 +62,7 @@ pk_alpm_transaction_sync_targets (PkBackendJob *job, const gchar **packages, gbo
}
pkg = alpm_db_get_pkg (i->data, name);
alpm_pkg_t *dep_to_remove = pk_alpm_pkg_replaces(priv->localdb, pkg);
dep_to_remove = pk_alpm_pkg_replaces(priv->localdb, pkg);
if (dep_to_remove) {
g_debug("scheduling to remove %s for %s", alpm_pkg_get_name(dep_to_remove), name);
alpm_remove_pkg(priv->alpm, dep_to_remove);

6
backends/alpm/pk-alpm-update.c
View File

@ -307,6 +307,7 @@ pk_alpm_update_databases (PkBackendJob *job, gint force, GError **error)
PkBackend *backend = pk_backend_job_get_backend (job);
PkBackendAlpmPrivate *priv = pk_backend_get_user_data (backend);
alpm_list_t *i;
int ret;
if (!pk_alpm_transaction_initialize (job, 0, NULL, error))
return FALSE;
@ -315,7 +316,7 @@ pk_alpm_update_databases (PkBackendJob *job, gint force, GError **error)
pk_backend_job_set_status (job, PK_STATUS_ENUM_DOWNLOAD_PACKAGELIST);
i = alpm_get_syncdbs (priv->alpm);
int ret = pk_alpm_refresh_databases(job, force, i, error);
ret = pk_alpm_refresh_databases(job, force, i, error);
if (i == NULL)
return pk_alpm_transaction_end (job, error);
@ -377,9 +378,10 @@ static int dep_vercmp(const char *version1, alpm_depmod_t mod,
alpm_pkg_t *
pk_alpm_pkg_replaces (alpm_db_t *db, alpm_pkg_t *pkg)
{
gboolean ret = FALSE;
g_return_val_if_fail (db != NULL, FALSE);
g_return_val_if_fail (pkg != NULL, FALSE);
gboolean ret = FALSE;
for (alpm_list_t *list = alpm_pkg_get_replaces (pkg); list != NULL && !ret; list = list->next) {
alpm_depend_t *depend = list->data;