svn commit: r252834 - head/usr.sbin/bsdconfig/share

[Devin Teske]

Author: dteske
Date: Fri Jul  5 20:01:07 2013
New Revision: 252834
URL: http://svnweb.freebsd.org/changeset/base/252834

Log:
  Oops, r252833 was not supposed to touch this file. Back-out and recommit
  this file with the rest of the files it was supposed to go with.

Modified:
  head/usr.sbin/bsdconfig/share/common.subr

Modified: head/usr.sbin/bsdconfig/share/common.subr
==============================================================================
--- head/usr.sbin/bsdconfig/share/common.subr	Fri Jul  5 19:57:40 2013	(r252833)
+++ head/usr.sbin/bsdconfig/share/common.subr	Fri Jul  5 20:01:07 2013	(r252834)
@@ -531,22 +531,12 @@ f_index_file()
 
 	if [ "$lang" ]; then
 		awk -v keyword="$keyword" "$f_index_file_awk" \
-			$BSDCFG_LIBE${BSDCFG_LIBE:+/}*/INDEX.$lang && return
+			$BSDCFG_LIBE${BSDCFG_LIBE:+/}*/INDEX.$lang &&
+			return
 		# No match, fall-thru to non-i18n sources
 	fi
 	awk -v keyword="$keyword" "$f_index_file_awk" \
-		$BSDCFG_LIBE${BSDCFG_LIBE:+/}*/INDEX && return
-
-	# No match? Fall-thru to `local' libexec sources (add-on modules)
-
-	[ "$BSDCFG_LOCAL_LIBE" ] || return $FAILURE
-	if [ "$lang" ]; then
-		awk -v keyword="$keyword" "$f_index_file_awk" \
-			$BSDCFG_LOCAL_LIBE/*/INDEX.$lang && return
-		# No match, fall-thru to non-i18n sources
-	fi
-	awk -v keyword="$keyword" "$f_index_file_awk" \
-		$BSDCFG_LOCAL_LIBE/*/INDEX
+		$BSDCFG_LIBE${BSDCFG_LIBE:+/}*/INDEX
 }
 
 # f_index_menusel_keyword $indexfile $pgm