6e828a7 More progressbar fixes. — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

More progressbar fixes.

Vsevolod Stakhov committed 11 years ago

commit 6e828a7caa45678fcbfafa4b945e04ba4016e824
parent 5a51c4d

3 files changed +6 -4

modified libpkg/pkg_add.c

@@ -134,6 +134,8 @@ do_extract(struct archive *a, struct archive_entry *ae, const char *location,

 cleanup:
 	pkg_emit_progress_tick(nfiles, nfiles);
 	if (renamed && retcode == EPKG_FATAL)
 		rename(rpath, pathname);

modified libpkg/pkg_delete.c

@@ -43,7 +43,6 @@

 int
 pkg_delete(struct pkg *pkg, struct pkgdb *db, unsigned flags)
 {
 	struct pkg_dep	*rdep = NULL;
 	int		 ret;
 	bool		 handle_rc = false;
 	int64_t		id;

@@ -118,10 +117,9 @@ pkg_delete_files(struct pkg *pkg, unsigned force)

 	char		 sha256[SHA256_DIGEST_LENGTH * 2 + 1];
 	const char	*path;
 	char		fpath[MAXPATHLEN];
 	int		nfiles, cur_file;
 	int		nfiles, cur_file = 0;
 	nfiles = HASH_COUNT(pkg->files);
 	cur_file = 1;
 	pkg_emit_progress_start(NULL);
 	/* fake to show a 100% progress */

@@ -161,6 +159,8 @@ pkg_delete_files(struct pkg *pkg, unsigned force)

 		}
 	}
 	pkg_emit_progress_tick(nfiles, nfiles);
 	return (EPKG_OK);
 }

modified libpkg/pkg_jobs.c

@@ -1971,7 +1971,7 @@ jobs_solve_install_upgrade(struct pkg_jobs *j)

 			candidates = pkg_jobs_find_install_candidates(j, &jcount);
 			pkg_emit_progress_start("Processing packages");
 			pkg_emit_progress_start("Checking for upgrades");
 			LL_FOREACH(candidates, c) {
 				pkg_emit_progress_tick(++elt_num, jcount);