36f9f5c Prompt/display updates — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Prompt/display updates

fixingshit committed 11 years ago

commit 36f9f5c7f14d34b3fd37fcf928b63208a8a66722
parent 3dee867

5 files changed +13 -13

modified src/autoremove.c

@@ -136,7 +136,7 @@ exec_autoremove(int argc, char **argv)

 				"Deinstallation has been requested for the following %d packages:\n\n", nbactions);
 		if (!dry_run)
 			rc = query_yesno(false,
 		            "\nProceed with deinstalling packages [y/N]: ");
 		            "\nProceed with deinstalling packages? [y/N]: ");
 	}
 	if (!rc || dry_run || (retcode = pkg_jobs_apply(jobs)) != EPKG_OK) {
 		goto cleanup;

modified src/delete.c

@@ -211,7 +211,7 @@ exec_delete(int argc, char **argv)

 			goto cleanup;
 		}
 		rc = query_yesno(false,
 		            "\nProceed with deinstalling packages [y/N]: ");
 		            "\nProceed with deinstalling packages? [y/N]: ");
 	}
 	else
 		rc = yes;

modified src/update.c

@@ -58,10 +58,10 @@ pkgcli_update(bool force, bool strict, const char *reponame)

 	if (!quiet) {
 		if (reponame != NULL)
 			printf("Updating \"%s\" repository catalogue\n",
 			printf("Updating \"%s\" repository catalogue...\n",
 			    reponame);
 		else
 			printf("Updating repository catalogue\n");
 			printf("Updating repository catalogue...\n");
 	}
 	if (pkg_repos_total_count() == 0) {

@@ -81,7 +81,7 @@ pkgcli_update(bool force, bool strict, const char *reponame)

 		retcode = pkg_update(r, force);
 		if (retcode == EPKG_UPTODATE) {
 			if (!quiet)
 				printf("%s repository is up-to-date\n", pkg_repo_name(r));
 				printf("%s repository is up-to-date.\n", pkg_repo_name(r));
 		}
 		else if (retcode != EPKG_OK && strict)
 			retcode = EPKG_FATAL;

@@ -98,13 +98,13 @@ pkgcli_update(bool force, bool strict, const char *reponame)

 	if (total_count == 0) {
 		if (!quiet)
 			printf("No repositories are enabled\n");
 			printf("No repositories are enabled.\n");
 		retcode = EPKG_FATAL;
 	}
 	else if (update_count == 0) {
 		if (!quiet)
 			if (retcode == EPKG_OK)
 				printf("All repositories are up-to-date\n");
 				printf("All repositories are up-to-date.\n");
 	}
 	return (retcode);

@@ -115,7 +115,7 @@ void

 usage_update(void)
 {
 	fprintf(stderr, "Usage: pkg update [-fq] [-r reponame]\n\n");
 	fprintf(stderr, "For more information see 'pkg help update'.\n");
 	fprintf(stderr, "For more information, see 'pkg help update'.\n");
 }
 int

@@ -160,7 +160,7 @@ exec_update(int argc, char **argv)

 			   PKGDB_DB_REPO);
 	if (ret == EPKG_ENOACCESS) {
 		warnx("Insufficient privileges to update the repository "
 		      "catalogue");
 		      "catalogue.");
 		return (EX_NOPERM);
 	} else if (ret != EPKG_OK)
 		return (EX_IOERR);

modified src/upgrade.c

@@ -212,7 +212,7 @@ exec_upgrade(int argc, char **argv)

 	}
 	if (done == 0 && rc)
 		printf("Your packages are up to date\n");
 		printf("Your packages are up to date.\n");
 	retcode = EX_OK;

modified src/utils.c

@@ -912,15 +912,15 @@ print_jobs_summary(struct pkg_jobs *jobs, const char *msg, ...)

 	if (oldsize > newsize) {
 		humanize_number(size, sizeof(size), oldsize - newsize, "B", HN_AUTOSCALE, 0);
 		printf("The operation will free %s\n", size);
 		printf("The operation will free %s.\n", size);
 	} else if (newsize > oldsize) {
 		humanize_number(size, sizeof(size), newsize - oldsize, "B", HN_AUTOSCALE, 0);
 		printf("The process will require %s more space\n", size);
 		printf("The process will require %s more space.\n", size);
 	}
 	if (dlsize > 0) {
 		humanize_number(size, sizeof(size), dlsize, "B", HN_AUTOSCALE, 0);
 		printf("%s to be downloaded\n", size);
 		printf("%s to be downloaded.\n", size);
 	}
 	return (displayed);