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

state: commit fdb changes even on error 

we might have done already something.
cute-signatures
Timo Teras 2009-07-22 16:11:21 +03:00
parent 5375efac1a
commit 9dc60e8d1c
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/state.c
View File

@ -690,6 +690,7 @@ int apk_state_commit(struct apk_state *state,
} }
/* Go through changes */ /* Go through changes */
r = 0;
list_for_each_entry(change, &state->change_list_head, change_list) { list_for_each_entry(change, &state->change_list_head, change_list) {
apk_print_change(db, change->oldpkg, change->newpkg); apk_print_change(db, change->oldpkg, change->newpkg);
prog.pkg = change->newpkg; prog.pkg = change->newpkg;
@ -700,7 +701,7 @@ int apk_state_commit(struct apk_state *state,
(apk_flags & APK_PROGRESS) ? progress_cb : NULL, (apk_flags & APK_PROGRESS) ? progress_cb : NULL,
&prog); &prog);
if (r != 0) if (r != 0)
return r; break;
} }
apk_count_change(change, &prog.done); apk_count_change(change, &prog.done);
@ -708,13 +709,14 @@ int apk_state_commit(struct apk_state *state,
if (apk_flags & APK_PROGRESS) if (apk_flags & APK_PROGRESS)
apk_draw_progress(20, 1); apk_draw_progress(20, 1);
if (!(apk_flags & APK_SIMULATE)) if (!(apk_flags & APK_SIMULATE) && prog.done.packages != 0)
apk_db_write_config(db); apk_db_write_config(db);
apk_message("OK: %d packages, %d dirs, %d files", if (r != 0)
db->installed.stats.packages, apk_message("OK: %d packages, %d dirs, %d files",
db->installed.stats.dirs, db->installed.stats.packages,
db->installed.stats.files); db->installed.stats.dirs,
db->installed.stats.files);
return 0; return r;
} }