svn commit: r252071 - stable/8/usr.sbin/sysinstall

[Devin Teske]

Author: dteske
Date: Fri Jun 21 21:59:58 2013
New Revision: 252071
URL: http://svnweb.freebsd.org/changeset/base/252071

Log:
  MFS9->8 r249822:
  Update error messages when processing the INDEX file to display the given
  path rather than a static string. This makes the error messages consistent
  with the rest of the functions which already do the same thing (assumed to
  be an oversight of r47055, 13+ years ago). A direct commit to stable/9.
  
  This is a direct commit to stable/8.
  
  Reviewed by:	eadler

Modified:
  stable/8/usr.sbin/sysinstall/index.c

Modified: stable/8/usr.sbin/sysinstall/index.c
==============================================================================
--- stable/8/usr.sbin/sysinstall/index.c	Fri Jun 21 21:38:48 2013	(r252070)
+++ stable/8/usr.sbin/sysinstall/index.c	Fri Jun 21 21:59:58 2013	(r252071)
@@ -865,11 +865,11 @@ index_initialize(char *path)
 	msgNotify("Attempting to fetch %s file from selected media.", path);
 	fp = DEVICE_GET(mediaDevice, path, TRUE);
 	if (!fp) {
-	    msgConfirm("Unable to get packages/INDEX file from selected media.\n\n"
+	    msgConfirm("Unable to get %s file from selected media.\n\n"
 		       "This may be because the packages collection is not available\n"
 		       "on the distribution media you've chosen, most likely an FTP site\n"
 		       "without the packages collection mirrored.  Please verify that\n"
-		       "your media, or your path to the media, is correct and try again.");
+		       "your media, or your path to the media, is correct and try again.", path);
 	    DEVICE_SHUTDOWN(mediaDevice);
 	    restorescr(w);
 	    return DITEM_FAILURE;
@@ -878,8 +878,9 @@ index_initialize(char *path)
 	msgNotify("Located INDEX, now reading package data from it...");
 	index_init(&Top, &Plist);
 	if (index_read(fp, &Top)) {
-	    msgConfirm("I/O or format error on packages/INDEX file.\n"
-		       "Please verify media (or path to media) and try again.");
+	    msgConfirm("I/O or format error on %s file.\n"
+		       "Please verify media (or path to media) and try again.",
+		       path);
 	    fclose(fp);
 	    restorescr(w);
 	    return DITEM_FAILURE;