jaiden
/
apk-tools
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

del: first remove all targets from world, and then calculate changes

cute-signatures
Timo Teras 2009-04-16 15:37:53 +03:00
parent d6f4fcacd1
commit 4e08c87621
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/del.c
View File

@ -27,13 +27,11 @@ static int del_main(void *ctx, int argc, char **argv)
if (db.world == NULL) if (db.world == NULL)
goto out; goto out;
state = apk_state_new(&db);
for (i = 0; i < argc; i++) { for (i = 0; i < argc; i++) {
struct apk_dependency dep;
name = apk_db_get_name(&db, APK_BLOB_STR(argv[i])); name = apk_db_get_name(&db, APK_BLOB_STR(argv[i]));
/* Remove from world, so we get proper changeset */ /* Remove from world, so we get proper changeset */
name->flags &= ~APK_NAME_TOPLEVEL;
for (j = 0; j < db.world->num; j++) { for (j = 0; j < db.world->num; j++) {
if (strcmp(db.world->item[j].name->name, if (strcmp(db.world->item[j].name->name,
argv[i]) == 0) { 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); 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) { dep = (struct apk_dependency) {
.name = name, .name = name,
.result_mask = APK_DEPMASK_CONFLICT, .result_mask = APK_DEPMASK_CONFLICT,