Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/netbsd-1-6]: src/usr.sbin/pkg_install/delete Pull up revision 1.37 (requ...



details:   https://anonhg.NetBSD.org/src/rev/cc09e3063d3e
branches:  netbsd-1-6
changeset: 529525:cc09e3063d3e
user:      tron <tron%NetBSD.org@localhost>
date:      Sun Nov 24 22:34:21 2002 +0000

description:
Pull up revision 1.37 (requested by jschauma in ticket #1011):
- eliminate the hard-coding of pathnames in the default install.
- all command executions now use the path [execvp/execlp/system].
- normalize the macro names as <COMMAND>_CMD.
- in some OS's full pathnames for commands can still be provided, but this
  is not the default.
This was needed to fix -DTAR_FULLPATHNAME="/usr/bin/tar"

diffstat:

 usr.sbin/pkg_install/delete/perform.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (35 lines):

diff -r 5e2bdbe2569a -r cc09e3063d3e usr.sbin/pkg_install/delete/perform.c
--- a/usr.sbin/pkg_install/delete/perform.c     Sun Nov 24 22:34:13 2002 +0000
+++ b/usr.sbin/pkg_install/delete/perform.c     Sun Nov 24 22:34:21 2002 +0000
@@ -1,11 +1,11 @@
-/*     $NetBSD: perform.c,v 1.34.2.1 2002/06/28 12:43:57 lukem Exp $   */
+/*     $NetBSD: perform.c,v 1.34.2.2 2002/11/24 22:34:21 tron Exp $    */
 
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static const char *rcsid = "from FreeBSD Id: perform.c,v 1.15 1997/10/13 15:03:52 jkh Exp";
 #else
-__RCSID("$NetBSD: perform.c,v 1.34.2.1 2002/06/28 12:43:57 lukem Exp $");
+__RCSID("$NetBSD: perform.c,v 1.34.2.2 2002/11/24 22:34:21 tron Exp $");
 #endif
 #endif
 
@@ -588,7 +588,7 @@
        if (fexists(REQUIRE_FNAME)) {
                if (Verbose)
                        printf("Executing 'require' script.\n");
-               vsystem("%s +x %s", CHMOD, REQUIRE_FNAME);      /* be sure */
+               vsystem("%s +x %s", CHMOD_CMD, REQUIRE_FNAME);  /* be sure */
                if (vsystem("./%s %s DEINSTALL", REQUIRE_FNAME, pkg)) {
                        warnx("package %s fails requirements %s", pkg,
                            Force ? "" : "- not deleted");
@@ -600,7 +600,7 @@
                if (Fake)
                        printf("Would execute de-install script at this point (arg: DEINSTALL).\n");
                else {
-                       vsystem("%s +x %s", CHMOD, DEINSTALL_FNAME);    /* make sure */
+                       vsystem("%s +x %s", CHMOD_CMD, DEINSTALL_FNAME);        /* make sure */
                        if (vsystem("./%s %s DEINSTALL", DEINSTALL_FNAME, pkg)) {
                                warnx("deinstall script returned error status");
                                if (!Force)



Home | Main Index | Thread Index | Old Index