Skip site navigation (1)Skip section navigation (2) 
Date:      Thu, 9 Dec 2010 15:27:43 +0000 (UTC)
From:      Bruce Cran <brucec@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
Subject:   svn commit: r216327 - stable/7/usr.sbin/sysinstall
Message-ID:  <201012091527.oB9FRh8k042590@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: brucec
Date: Thu Dec  9 15:27:43 2010
New Revision: 216327
URL: http://svn.freebsd.org/changeset/base/216327

Log:
  MFC r216243:
  
  Ignore any failures with the "local" distribution since it's not present
  on release CDs and so will normally fail.
  installCommit() returns a DITEM_ value, not a Boolean.
  distExtractAll() returns a Boolean, not a DITEM_ value.
  
  Approved by:	re (kensmith)

Modified:
  stable/7/usr.sbin/sysinstall/dist.c
  stable/7/usr.sbin/sysinstall/install.c
Directory Properties:
  stable/7/usr.sbin/sysinstall/   (props changed)

Modified: stable/7/usr.sbin/sysinstall/dist.c
==============================================================================
--- stable/7/usr.sbin/sysinstall/dist.c	Thu Dec  9 15:26:38 2010	(r216326)
+++ stable/7/usr.sbin/sysinstall/dist.c	Thu Dec  9 15:27:43 2010	(r216327)
@@ -781,6 +781,9 @@ distExtract(char *parent, Distribution *
 			canceled = 1;	
 
 		    status = FALSE;
+		} else {
+			// ignore any failures with DIST_LOCAL
+			status = TRUE;
 		}
 	    }
 	    break;
@@ -878,7 +881,7 @@ distExtractAll(dialogMenuItem *self)
     restorescr(w);
 
     if (extract_status == FALSE)
-	status = DITEM_FAILURE;
+	status = FALSE;
 
     return status;
 }

Modified: stable/7/usr.sbin/sysinstall/install.c
==============================================================================
--- stable/7/usr.sbin/sysinstall/install.c	Thu Dec  9 15:26:38 2010	(r216326)
+++ stable/7/usr.sbin/sysinstall/install.c	Thu Dec  9 15:27:43 2010	(r216327)
@@ -817,7 +817,7 @@ try_media:
     i = distExtractAll(self);
 
     if (i == FALSE)
-	    return FALSE;
+	    return DITEM_FAILURE;
 
     /* When running as init, *now* it's safe to grab the rc.foo vars */
     installEnvironment();

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201012091527.oB9FRh8k042590>