From 4e08c8762139305c1f522b075529d50c1ececafd Mon Sep 17 00:00:00 2001 From: Timo Teras Date: Thu, 16 Apr 2009 15:37:53 +0300 Subject: del: first remove all targets from world, and then calculate changes --- src/del.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'src/del.c') diff --git a/src/del.c b/src/del.c index e980d71..00938b7 100644 --- a/src/del.c +++ b/src/del.c @@ -27,13 +27,11 @@ static int del_main(void *ctx, int argc, char **argv) if (db.world == NULL) goto out; - state = apk_state_new(&db); for (i = 0; i < argc; i++) { - struct apk_dependency dep; - name = apk_db_get_name(&db, APK_BLOB_STR(argv[i])); /* Remove from world, so we get proper changeset */ + name->flags &= ~APK_NAME_TOPLEVEL; for (j = 0; j < db.world->num; j++) { if (strcmp(db.world->item[j].name->name, argv[i]) == 0) { @@ -43,8 +41,13 @@ static int del_main(void *ctx, int argc, char **argv) apk_dependency_array_resize(db.world, db.world->num-1); } } - name->flags &= ~APK_NAME_TOPLEVEL; + } + state = apk_state_new(&db); + for (i = 0; i < argc; i++) { + struct apk_dependency dep; + + name = apk_db_get_name(&db, APK_BLOB_STR(argv[i])); dep = (struct apk_dependency) { .name = name, .result_mask = APK_DEPMASK_CONFLICT, -- cgit v1.2.3-60-g2f50