Don't install compat22 by default.

Add some more safety belts to package foo.

4 files changed, 18 insertions, 8 deletions

diff --git a/release/sysinstall/dist.h b/release/sysinstall/dist.h
index 01ea491..e301d9c 100644
--- a/release/sysinstall/dist.h
+++ b/release/sysinstall/dist.h
@@ -1,4 +1,4 @@
-/*  $Id:$  */
+/*  $Id: dist.h,v 1.33 1999/04/21 07:42:02 obrien Exp $  */
 
 #ifndef _DIST_H_INCLUDE
 #define _DIST_H_INCLUDE
@@ -25,10 +25,10 @@
 
 /* Canned distribution sets */
 #define _DIST_DEVELOPER \
-	(DIST_BIN | DIST_DOC | DIST_MANPAGES | DIST_DICT | DIST_PROFLIBS | DIST_INFO | DIST_SRC | DIST_COMPAT22)
+	(DIST_BIN | DIST_DOC | DIST_MANPAGES | DIST_DICT | DIST_PROFLIBS | DIST_INFO | DIST_SRC )
 
 #define _DIST_USER \
-	(DIST_BIN | DIST_DOC | DIST_MANPAGES | DIST_DICT | DIST_COMPAT22)
+	(DIST_BIN | DIST_DOC | DIST_MANPAGES | DIST_DICT )
 
 /* Subtypes for DES distribution */
 #define DIST_DES_DES		0x0001
diff --git a/release/sysinstall/package.c b/release/sysinstall/package.c
index 990064c..43d99b6 100644
--- a/release/sysinstall/package.c
+++ b/release/sysinstall/package.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: package.c,v 1.66 1999/02/05 22:15:51 jkh Exp $
+ * $Id: package.c,v 1.67 1999/04/27 14:33:29 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -79,6 +79,10 @@ package_exists(char *name)
     char fname[FILENAME_MAX];
     int status /* = vsystem("pkg_info -e %s", name) */;
 
+    /* If in "Latest" syntax, ignore; can't tell with these */
+    if (name[0] == '@')
+	return FALSE;
+
     /* XXX KLUDGE ALERT!  This makes evil assumptions about how XXX
      * packages register themselves and should *really be done with
      * `pkg_info -e <name>' except that this it's too slow for an
@@ -192,6 +196,7 @@ package_extract(Device *dev, char *name, Boolean depended)
 	    refresh();
 	    i = waitpid(pid, &tot, 0);
 	    if (sigpipe_caught || i < 0 || WEXITSTATUS(tot)) {
+		ret = DITEM_FAILURE | DITEM_RESTORE;
 		if (variable_get(VAR_NO_CONFIRM))
 		    msgNotify("Add of package %s aborted, error code %d -\n"
 			      "Please check the debug screen for more info.", name, WEXITSTATUS(tot));
diff --git a/usr.sbin/sysinstall/dist.h b/usr.sbin/sysinstall/dist.h
index 01ea491..e301d9c 100644
--- a/usr.sbin/sysinstall/dist.h
+++ b/usr.sbin/sysinstall/dist.h
@@ -1,4 +1,4 @@
-/*  $Id:$  */
+/*  $Id: dist.h,v 1.33 1999/04/21 07:42:02 obrien Exp $  */
 
 #ifndef _DIST_H_INCLUDE
 #define _DIST_H_INCLUDE
@@ -25,10 +25,10 @@
 
 /* Canned distribution sets */
 #define _DIST_DEVELOPER \
-	(DIST_BIN | DIST_DOC | DIST_MANPAGES | DIST_DICT | DIST_PROFLIBS | DIST_INFO | DIST_SRC | DIST_COMPAT22)
+	(DIST_BIN | DIST_DOC | DIST_MANPAGES | DIST_DICT | DIST_PROFLIBS | DIST_INFO | DIST_SRC )
 
 #define _DIST_USER \
-	(DIST_BIN | DIST_DOC | DIST_MANPAGES | DIST_DICT | DIST_COMPAT22)
+	(DIST_BIN | DIST_DOC | DIST_MANPAGES | DIST_DICT )
 
 /* Subtypes for DES distribution */
 #define DIST_DES_DES		0x0001
diff --git a/usr.sbin/sysinstall/package.c b/usr.sbin/sysinstall/package.c
index 990064c..43d99b6 100644
--- a/usr.sbin/sysinstall/package.c
+++ b/usr.sbin/sysinstall/package.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: package.c,v 1.66 1999/02/05 22:15:51 jkh Exp $
+ * $Id: package.c,v 1.67 1999/04/27 14:33:29 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -79,6 +79,10 @@ package_exists(char *name)
     char fname[FILENAME_MAX];
     int status /* = vsystem("pkg_info -e %s", name) */;
 
+    /* If in "Latest" syntax, ignore; can't tell with these */
+    if (name[0] == '@')
+	return FALSE;
+
     /* XXX KLUDGE ALERT!  This makes evil assumptions about how XXX
      * packages register themselves and should *really be done with
      * `pkg_info -e <name>' except that this it's too slow for an
@@ -192,6 +196,7 @@ package_extract(Device *dev, char *name, Boolean depended)
 	    refresh();
 	    i = waitpid(pid, &tot, 0);
 	    if (sigpipe_caught || i < 0 || WEXITSTATUS(tot)) {
+		ret = DITEM_FAILURE | DITEM_RESTORE;
 		if (variable_get(VAR_NO_CONFIRM))
 		    msgNotify("Add of package %s aborted, error code %d -\n"
 			      "Please check the debug screen for more info.", name, WEXITSTATUS(tot));