summaryrefslogtreecommitdiffstats
path: root/usr.sbin/pkg
diff options
context:
space:
mode:
authormatthew <matthew@FreeBSD.org>2012-12-22 15:13:16 +0000
committermatthew <matthew@FreeBSD.org>2012-12-22 15:13:16 +0000
commit45679ebc7bd01bdb686bd33c1997dddb0f092ea5 (patch)
tree6c9d6670131315ac4c01c5d42b5f7a3c93f15d2f /usr.sbin/pkg
parent93c8ab3bc433d3a5ff6415d019149717a2e1eff7 (diff)
downloadFreeBSD-src-45679ebc7bd01bdb686bd33c1997dddb0f092ea5.zip
FreeBSD-src-45679ebc7bd01bdb686bd33c1997dddb0f092ea5.tar.gz
Switch from 'pkg -n' to 'pkg -N' as the test for pkgn activation
status. '-n' is already used extensively elsewhere in pkgng (to mean 'dry-run') and this reduces the potential confusion Submitted by: eadler Approved by: bapt MFC after: 2 weeks
Diffstat (limited to 'usr.sbin/pkg')
-rw-r--r--usr.sbin/pkg/pkg.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.sbin/pkg/pkg.c b/usr.sbin/pkg/pkg.c
index eec01c2..aa8260b 100644
--- a/usr.sbin/pkg/pkg.c
+++ b/usr.sbin/pkg/pkg.c
@@ -453,11 +453,11 @@ main(__unused int argc, char *argv[])
if (access(pkgpath, X_OK) == -1) {
/*
- * To allow 'pkg -n' to be used as a reliable test for whether
+ * To allow 'pkg -N' to be used as a reliable test for whether
* a system is configured to use pkg, don't bootstrap pkg
* when that argument is given as argv[1].
*/
- if ( argv[1] != NULL && strcmp(argv[1], "-n") == 0) {
+ if ( argv[1] != NULL && strcmp(argv[1], "-N") == 0) {
printf("%s", "pkg is not installed\n");
exit(EXIT_FAILURE);
}
OpenPOWER on IntegriCloud