summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAurelien Foret <aurelien@archlinux.org>2006-02-22 19:49:06 +0000
committerAurelien Foret <aurelien@archlinux.org>2006-02-22 19:49:06 +0000
commit3f9ddf262df63901c8d91fc8e0a9fe41e5e489d4 (patch)
tree34fb18413526faee2a9c22b26a74cfc570c8f591
parent77061889797cdddab49f587e9e0011f2e47b8c85 (diff)
downloadpacman-3f9ddf262df63901c8d91fc8e0a9fe41e5e489d4.tar.xz
skipped conflict resolution for targets removed from transaction set
-rw-r--r--lib/libalpm/sync.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c
index cec0b427..22f49f84 100644
--- a/lib/libalpm/sync.c
+++ b/lib/libalpm/sync.c
@@ -471,6 +471,11 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, PMList *dbs_sync, PML
}
sync = find_pkginsync(miss->target, trans->packages);
+ if(sync == NULL) {
+ _alpm_log(PM_LOG_DEBUG, "'%s' not found in transaction set -- skipping",
+ miss->target);
+ continue;
+ }
local = _alpm_db_get_pkgfromcache(db_local, miss->depend.name);
/* check if this package also "provides" the package it's conflicting with