61222ff Fix jobs summary output. — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Fix jobs summary output.

Vsevolod Stakhov committed 12 years ago

commit 61222ff3aa810ae61ed3654019aefd8e53ab6b3b
parent 1f63c96

2 files changed +6 -8

modified libpkg/pkg_jobs.c

@@ -488,7 +488,6 @@ jobs_solve_deinstall(struct pkg_jobs *j)

 	struct job_pattern *jp = NULL;
 	struct pkg *pkg = NULL;
 	struct pkgdb_it *it;
 	int64_t oldsize;
 	char *origin;
 	bool recursive = false;

@@ -506,8 +505,7 @@ jobs_solve_deinstall(struct pkg_jobs *j)

 				pkg_emit_locked(pkg);
 			}
 			else {
 				pkg_get(pkg, PKG_ORIGIN, &origin, PKG_FLATSIZE, &oldsize);
 				pkg_set(pkg, PKG_OLD_FLATSIZE, oldsize, PKG_FLATSIZE, (int64_t)0);
 				pkg_get(pkg, PKG_ORIGIN, &origin);
 				pkg_jobs_add_req(j, origin, pkg, false, 0);
 			}
 			/* TODO: use repository priority here */

@@ -528,7 +526,6 @@ jobs_solve_autoremove(struct pkg_jobs *j)

 	struct pkg *pkg = NULL;
 	struct pkgdb_it *it;
 	char *origin;
 	int64_t oldsize;
 	struct pkg_job_universe_item *unit;
 	if ((it = pkgdb_query(j->db, " WHERE automatic=1 ", MATCH_CONDITION)) == NULL)

@@ -543,8 +540,7 @@ jobs_solve_autoremove(struct pkg_jobs *j)

 				pkg_emit_locked(pkg);
 			}
 			else if (pkg_jobs_test_automatic(j, pkg, 0)) {
 				pkg_get(pkg, PKG_ORIGIN, &origin, PKG_FLATSIZE, &oldsize);
 				pkg_set(pkg, PKG_OLD_FLATSIZE, oldsize, PKG_FLATSIZE, (int64_t)0);
 				pkg_get(pkg, PKG_ORIGIN, &origin);
 				pkg_debug(2, "removing %s as it has no non-automatic reverse depends",
 						origin);
 				pkg_jobs_add_req(j, origin, pkg, false, 0);

modified src/utils.c

@@ -676,8 +676,10 @@ print_jobs_summary(struct pkg_jobs *jobs, const char *msg, ...)

 		printf("\nThe process will require %s more space\n", size);
 	}
 	humanize_number(size, sizeof(size), dlsize, "B", HN_AUTOSCALE, 0);
 	printf("\n%s to be downloaded\n", size);
 	if (dlsize > 0) {
 		humanize_number(size, sizeof(size), dlsize, "B", HN_AUTOSCALE, 0);
 		printf("\n%s to be downloaded\n", size);
 	}
 }
 struct sbuf *