[pkgsrc/trunk]: pkgsrc/pkgtools/pkg_install/files Eek, revert previous; these...

[tv <tv%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a8d6dc033b63
branches:  trunk
changeset: 471532:a8d6dc033b63
user:      tv <tv%pkgsrc.org@localhost>
date:      Mon Mar 29 02:25:06 2004 +0000

description:
Eek, revert previous; these weren't supposed to be committed.

diffstat:

 pkgtools/pkg_install/files/add/perform.c |  8 ++------
 pkgtools/pkg_install/files/delete/main.c |  6 ++----
 2 files changed, 4 insertions(+), 10 deletions(-)

diffs (62 lines):

diff -r 2303b3269f78 -r a8d6dc033b63 pkgtools/pkg_install/files/add/perform.c
--- a/pkgtools/pkg_install/files/add/perform.c  Mon Mar 29 02:24:11 2004 +0000
+++ b/pkgtools/pkg_install/files/add/perform.c  Mon Mar 29 02:25:06 2004 +0000
@@ -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 @@
        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 -r 2303b3269f78 -r a8d6dc033b63 pkgtools/pkg_install/files/delete/main.c
--- a/pkgtools/pkg_install/files/delete/main.c  Mon Mar 29 02:24:11 2004 +0000
+++ b/pkgtools/pkg_install/files/delete/main.c  Mon Mar 29 02:25:06 2004 +0000
@@ -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 @@
                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