898adf8 Load the locking status for deleting jobs. Adjust the pre-deletion confirmation message — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Load the locking status for deleting jobs. Adjust the pre-deletion confirmation message

Matthew Seaman committed 13 years ago

commit 898adf819d9ecbe830edfb183247e2c20090b3fd
parent 5b5203d

2 files changed +2 -2

modified libpkg/pkgdb.c

@@ -3066,7 +3066,7 @@ pkgdb_query_delete(struct pkgdb *db, match_t match, int nbpkgs, char **pkgs,

 	const char	 sqlsel[] = ""
 		"SELECT id, p.origin, name, version, comment, desc, "
 		"message, arch, maintainer, www, prefix, "
 		"message, arch, maintainer, www, prefix, locked,"
 		"flatsize, (select count(*) from deps AS d where d.origin=del.origin) as weight FROM packages as p, delete_job as del where id = pkgid "
 		"ORDER BY weight ASC;";

modified pkg/delete.c

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

 	pkg = NULL;
 	if (!quiet || dry_run) {
 		print_jobs_summary(jobs, PKG_JOBS_DEINSTALL,
 		    "The following %d packages will be deinstalled:\n\n", nbactions);
 		    "Deinstallation has been requested for the following %d packages:\n\n", nbactions);
 		if (!yes && !dry_run)
 			yes = query_yesno(
 		            "\nProceed with deinstalling packages [y/N]: ");