svn commit: r249822 - stable/9/usr.sbin/sysinstall

[Devin Teske]

Author: dteske
Date: Tue Apr 23 22:45:03 2013
New Revision: 249822
URL: http://svnweb.freebsd.org/changeset/base/249822

Log:
  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 or r47055, 13+ years ago). A direct commit to stable/9.
  
  Reviewed by:	eadler
  MFC after:	3 days

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

Modified: stable/9/usr.sbin/sysinstall/index.c
==============================================================================
--- stable/9/usr.sbin/sysinstall/index.c	Tue Apr 23 19:42:45 2013	(r249821)
+++ stable/9/usr.sbin/sysinstall/index.c	Tue Apr 23 22:45:03 2013	(r249822)
@@ -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;