summaryrefslogtreecommitdiff
path: root/pkgtools/pkg_install
diff options
context:
space:
mode:
authortv <tv@pkgsrc.org>2004-03-29 02:25:06 +0000
committertv <tv@pkgsrc.org>2004-03-29 02:25:06 +0000
commit857ccccb5d7e27df6aa05fc419653e7b8ee64183 (patch)
tree7e653b593cb741e65a0ef8be5ff6c051dad480be /pkgtools/pkg_install
parent1ccbfa9d6c88fd8902aae0114406c910e5a9ebab (diff)
downloadpkgsrc-857ccccb5d7e27df6aa05fc419653e7b8ee64183.tar.gz
Eek, revert previous; these weren't supposed to be committed.
Diffstat (limited to 'pkgtools/pkg_install')
-rw-r--r--pkgtools/pkg_install/files/add/perform.c8
-rw-r--r--pkgtools/pkg_install/files/delete/main.c6
2 files changed, 4 insertions, 10 deletions
diff --git a/pkgtools/pkg_install/files/add/perform.c b/pkgtools/pkg_install/files/add/perform.c
index 50f259a8e43..4fa02653631 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.16 2004/03/29 02:24:11 tv Exp $ */
+/* $NetBSD: perform.c,v 1.17 2004/03/29 02:25:06 tv Exp $ */
#if HAVE_CONFIG_H
#include "config.h"
@@ -11,7 +11,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.16 2004/03/29 02:24:11 tv Exp $");
+__RCSID("$NetBSD: perform.c,v 1.17 2004/03/29 02:25:06 tv Exp $");
#endif
#endif
@@ -720,13 +720,9 @@ ignore_replace_depends_check:
if (!NoRecord && !Fake) {
char contents[FILENAME_MAX];
-#ifdef __INTERIX
- umask(002);
-#else
umask(022);
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 75184d0fd26..4d79e4924db 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.11 2004/03/29 02:24:11 tv Exp $ */
+/* $NetBSD: main.c,v 1.12 2004/03/29 02:25:06 tv 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.11 2004/03/29 02:24:11 tv Exp $");
+__RCSID("$NetBSD: main.c,v 1.12 2004/03/29 02:25:06 tv Exp $");
#endif
#endif
@@ -184,11 +184,9 @@ main(int argc, char **argv)
warnx("missing package name(s)");
usage();
}
-#ifndef __INTERIX
if (!Fake && 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