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. Reported by: kensmith MFC after: 3 days
This commit is contained in:
parent
5f5ca78b03
commit
21866e59c2
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=216243
@ -757,6 +757,9 @@ distExtract(char *parent, Distribution *me)
|
||||
canceled = 1;
|
||||
|
||||
status = FALSE;
|
||||
} else {
|
||||
// ignore any failures with DIST_LOCAL
|
||||
status = TRUE;
|
||||
}
|
||||
}
|
||||
break;
|
||||
@ -913,7 +916,7 @@ distExtractAll(dialogMenuItem *self)
|
||||
restorescr(w);
|
||||
|
||||
if (extract_status == FALSE)
|
||||
status = DITEM_FAILURE;
|
||||
status = FALSE;
|
||||
|
||||
return status;
|
||||
}
|
||||
|
@ -855,7 +855,7 @@ installCommit(dialogMenuItem *self)
|
||||
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();
|
||||
|
Loading…
Reference in New Issue
Block a user