Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 3e77b73
Fix pkg set -o
Baptiste Daroussin committed 11 years ago
commit 3e77b7393d6de3e64d0dc8eb82c0743d289a58c7
parent 10923e0
1 file changed +10 -7
modified src/set.c
@@ -186,13 +186,16 @@ exec_set(int argc, char **argv)
			return (EX_SOFTWARE);*/

		}
- 
		if (pkg != NULL)
- 
			rc = query_yesno(false, "Change origin from %S to %S for %n-%v? [y/N]: ",
- 
					oldorigin, neworigin, pkg, pkg);
- 
		else
- 
			rc = query_yesno(false, "Change origin from %S to %S for all dependencies? "
- 
					"[y/N]: ", oldorigin, neworigin);
- 
		if (pkg != NULL && yes) {
+ 
		rc = yes;
+ 
		if (!yes) {
+ 
			if (pkg != NULL)
+ 
				rc = query_yesno(false, "Change origin from %S to %S for %n-%v? [y/N]: ",
+ 
						oldorigin, neworigin, pkg, pkg);
+ 
			else
+ 
				rc = query_yesno(false, "Change origin from %S to %S for all dependencies? "
+ 
						"[y/N]: ", oldorigin, neworigin);
+ 
		}
+ 
		if (pkg != NULL && rc) {

			if (pkgdb_set(db, pkg, PKG_SET_ORIGIN, neworigin) != EPKG_OK) {

				retcode = EX_IOERR;

				goto cleanup;