summaryrefslogtreecommitdiff
path: root/pkgtools
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2006-04-04 06:27:13 +0000
committerwiz <wiz@pkgsrc.org>2006-04-04 06:27:13 +0000
commit8d27f5d82ef86b1aa17a52e08000b47a08eee1d0 (patch)
treeb183b45dfef846c7d3ede60e89664d2f4218117b /pkgtools
parent3774c1a14d36055a7589c6d1e32393fb50f09488 (diff)
downloadpkgsrc-8d27f5d82ef86b1aa17a52e08000b47a08eee1d0.tar.gz
Pull over 1.36 from src/usr.sbin:
revision 1.36 date: 2005/12/03 01:08:38; author: hubertf; state: Exp; lines: +3 -3 Only warn about running as non-root when -v is given (or when running in non-unprivilegedmode, but how to detect?)
Diffstat (limited to 'pkgtools')
-rw-r--r--pkgtools/pkg_install/files/delete/main.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgtools/pkg_install/files/delete/main.c b/pkgtools/pkg_install/files/delete/main.c
index fc125ddab54..02a8ca64423 100644
--- a/pkgtools/pkg_install/files/delete/main.c
+++ b/pkgtools/pkg_install/files/delete/main.c
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.16 2004/12/29 12:16:56 agc Exp $ */
+/* $NetBSD: main.c,v 1.17 2006/04/04 06:27:13 wiz Exp $ */
#if HAVE_CONFIG_H
#include "config.h"
@@ -11,7 +11,7 @@
#if 0
static char *rcsid = "from FreeBSD Id: main.c,v 1.11 1997/10/08 07:46:48 charnier Exp";
#else
-__RCSID("$NetBSD: main.c,v 1.16 2004/12/29 12:16:56 agc Exp $");
+__RCSID("$NetBSD: main.c,v 1.17 2006/04/04 06:27:13 wiz Exp $");
#endif
#endif
@@ -191,7 +191,7 @@ main(int argc, char **argv)
usage();
}
#ifndef __INTERIX
- if (!Fake && getuid() != 0) {
+ if (!Fake && Verbose && getuid() != 0) {
warnx("not running as root - trying to delete anyways");
}
#endif