Skip to content
Snippets Groups Projects
Commit 90220e71 authored by Timo Teräs's avatar Timo Teräs
Browse files

commit: fixup progress during package removal

also adjust test suite to test for package removal

fixes 6007db9c print: refactor progress printing API
parent 3cf03932
No related branches found
No related tags found
No related merge requests found
Pipeline #285703 passed
......@@ -441,7 +441,7 @@ int apk_solver_commit_changeset(struct apk_database *db,
if (!(db->ctx->flags & APK_SIMULATE) &&
((change->old_pkg != change->new_pkg) ||
(change->reinstall && pkg_available(db, change->new_pkg)))) {
apk_progress_item_start(&prog.prog, apk_progress_weight(prog.done.bytes, prog.done.packages), prog.pkg->size);
apk_progress_item_start(&prog.prog, apk_progress_weight(prog.done.bytes, prog.done.packages), prog.pkg ? prog.pkg->size : 0);
r = apk_db_install_pkg(db, change->old_pkg, change->new_pkg, &prog.prog) != 0;
apk_progress_item_end(&prog.prog);
}
......
......@@ -22,7 +22,7 @@ mkdir -p "$TEST_ROOT"/etc/apk/cache
$APK add --initdb $TEST_USERMODE --repository "file://localhost/$PWD/repo/index.adb" meta
# reinstall from cache
rm -rf "$TEST_ROOT"/lib/apk
$APK del meta
$APK add --initdb $TEST_USERMODE --no-network --repository "file://localhost/$PWD/repo/index.adb" meta
# make sure fetch still works
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment