056ddf2 Switch to recursive deletion by default. — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Switch to recursive deletion by default.

Vsevolod Stakhov committed 12 years ago

commit 056ddf2ee79796d7befe2232e0deef9406ab0775
parent c7f50e4

1 file changed +11 -1

modified src/delete.c

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

 	match_t match = MATCH_EXACT;
 	int ch;
 	bool force = false;
 	bool recursive_flag = false;
 	bool yes;
 	bool dry_run = false;
 	int retcode = EX_SOFTWARE;

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

 			quiet = true;
 			break;
 		case 'R':
 			f |= PKG_FLAG_RECURSIVE;
 			recursive_flag = true;
 			break;
 		case 'x':
 			match = MATCH_REGEX;

@@ -142,6 +143,15 @@ exec_delete(int argc, char **argv)

 		return (EX_IOERR);
 	}
 	/*
 	 * By default delete packages recursively.
 	 * If force mode is enabled then we try to remove packages non-recursively.
 	 * However, if -f and -R flags are both enabled then we return to
 	 * recursive deletion.
 	 */
 	if (!force || recursive_flag)
 		f |= PKG_FLAG_RECURSIVE;
 	pkg_jobs_set_flags(jobs, f);
 	if (match == MATCH_EXACT) {