diff options
| author | rillig <rillig> | 2007-09-08 09:58:14 +0000 |
|---|---|---|
| committer | rillig <rillig> | 2007-09-08 09:58:14 +0000 |
| commit | 9a8ef6c4845c9c331aba9a77ed4fe5d36aac3436 (patch) | |
| tree | 24412d9a5904b4af85d4c5dd8068e8eff96fdb97 /pkgtools/pkg_install | |
| parent | e3dc025536a363ee9566caf49398219036faa4dd (diff) | |
| download | pkgsrc-9a8ef6c4845c9c331aba9a77ed4fe5d36aac3436.tar.gz | |
Removed the warning about pkg_add or pkg_delete "not running as root"
completely. It only made the code more bloated, and a user trying to add
or delete packages would get lots of "Permission denied" warnings
anyway.
Diffstat (limited to 'pkgtools/pkg_install')
| -rw-r--r-- | pkgtools/pkg_install/files/add/perform.c | 8 | ||||
| -rw-r--r-- | pkgtools/pkg_install/files/delete/main.c | 10 |
2 files changed, 5 insertions, 13 deletions
diff --git a/pkgtools/pkg_install/files/add/perform.c b/pkgtools/pkg_install/files/add/perform.c index 24538a38dbe..649649ec231 100644 --- a/pkgtools/pkg_install/files/add/perform.c +++ b/pkgtools/pkg_install/files/add/perform.c @@ -1,4 +1,4 @@ -/* $NetBSD: perform.c,v 1.60 2007/09/07 15:45:14 rillig Exp $ */ +/* $NetBSD: perform.c,v 1.61 2007/09/08 09:58:14 rillig Exp $ */ #if HAVE_CONFIG_H #include "config.h" @@ -14,7 +14,7 @@ #if 0 static const char *rcsid = "from FreeBSD Id: perform.c,v 1.44 1997/10/13 15:03:46 jkh Exp"; #else -__RCSID("$NetBSD: perform.c,v 1.60 2007/09/07 15:45:14 rillig Exp $"); +__RCSID("$NetBSD: perform.c,v 1.61 2007/09/08 09:58:14 rillig Exp $"); #endif #endif @@ -855,10 +855,6 @@ pkg_do(const char *pkg, lpkg_head_t *pkgs) if (!NoRecord && !Fake) { char contents[MaxPathSize]; -#if !defined(__INTERIX) && !defined(UNPRIVILEGED) - if (getuid() != 0) - warnx("not running as root - trying to record install anyway"); -#endif if (!PkgName) { warnx("no package name! can't record package, sorry"); errc = 1; diff --git a/pkgtools/pkg_install/files/delete/main.c b/pkgtools/pkg_install/files/delete/main.c index 2b70a81ee53..94a3c0bbe70 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.20 2007/09/07 15:45:15 rillig Exp $ */ +/* $NetBSD: main.c,v 1.21 2007/09/08 09:58:14 rillig 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.20 2007/09/07 15:45:15 rillig Exp $"); +__RCSID("$NetBSD: main.c,v 1.21 2007/09/08 09:58:14 rillig Exp $"); #endif #endif @@ -190,11 +190,7 @@ main(int argc, char **argv) warnx("missing package name(s)"); usage(); } -#if !defined(__INTERIX) && !defined(UNPRIVILEGED) - if (!Fake && Verbose && getuid() != 0) { - warnx("not running as root - trying to delete anyways"); - } -#endif + if (OnlyDeleteFromPkgDB) { /* Only delete the given packages' files from pkgdb, do not * touch the pkg itself. Used by "make reinstall" in |