From owner-svn-src-stable@FreeBSD.ORG Tue Apr 23 22:45:04 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 95573625; Tue, 23 Apr 2013 22:45:04 +0000 (UTC) (envelope-from dteske@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 6D8D81322; Tue, 23 Apr 2013 22:45:04 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r3NMj4fi031272; Tue, 23 Apr 2013 22:45:04 GMT (envelope-from dteske@svn.freebsd.org) Received: (from dteske@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r3NMj4eh031271; Tue, 23 Apr 2013 22:45:04 GMT (envelope-from dteske@svn.freebsd.org) Message-Id: <201304232245.r3NMj4eh031271@svn.freebsd.org> From: Devin Teske Date: Tue, 23 Apr 2013 22:45:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r249822 - stable/9/usr.sbin/sysinstall X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Apr 2013 22:45:04 -0000 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;