vapier 15/08/29 04:44:58 Modified: locale-gen Log: locale-gen: detect non-unique locale names #235555
Revision Changes Path 1.38 src/patchsets/glibc/extra/locale/locale-gen file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/glibc/extra/locale/locale-gen?rev=1.38&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/glibc/extra/locale/locale-gen?rev=1.38&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/glibc/extra/locale/locale-gen?r1=1.37&r2=1.38 Index: locale-gen =================================================================== RCS file: /var/cvsroot/gentoo/src/patchsets/glibc/extra/locale/locale-gen,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- locale-gen 21 Jul 2015 02:28:16 -0000 1.37 +++ locale-gen 29 Aug 2015 04:44:58 -0000 1.38 @@ -52,7 +52,7 @@ } show_version() { local b="(" a=")" - local cvsver="$Revision: 1.37 $b $Date: 2015/07/21 02:28:16 $a" + local cvsver="$Revision: 1.38 $b $Date: 2015/08/29 04:44:58 $a" echo "locale-gen-${cvsver//: }" exit 0 } @@ -185,13 +185,13 @@ -e '/^[[:space:]]*$/d' \ "${CONFIG}" | sort) # Sanity check to make sure people did not duplicate entries. #550884 + # The first column must be unique specifically. #235555 dup_locales_to_generate=$( echo "${locales_to_generate}" | \ - uniq -c | \ - awk '$1 != "1" {$1 = ""; print}') + awk '{ if ($1 == last) { print lastline; print; } else { lastline = $0; last = $1; } }') if [[ -n ${dup_locales_to_generate} ]] ; then ewarn "These locales have been duplicated in your config:\n${dup_locales_to_generate}" - ewarn "They will be filtered, but you should still fix." + ewarn "Some might be filtered, but you must fix it." locales_to_generate=$(echo "${locales_to_generate}" | uniq) fi fi
