vapier 15/07/21 02:28:16 Modified: locale-gen Log: detect & warn & filter out duplicate locale generation entries #550884 by Toralf Förster
Revision Changes Path 1.37 src/patchsets/glibc/extra/locale/locale-gen file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/glibc/extra/locale/locale-gen?rev=1.37&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/glibc/extra/locale/locale-gen?rev=1.37&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/glibc/extra/locale/locale-gen?r1=1.36&r2=1.37 Index: locale-gen =================================================================== RCS file: /var/cvsroot/gentoo/src/patchsets/glibc/extra/locale/locale-gen,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- locale-gen 28 Dec 2014 18:45:18 -0000 1.36 +++ locale-gen 21 Jul 2015 02:28:16 -0000 1.37 @@ -52,7 +52,7 @@ } show_version() { local b="(" a=")" - local cvsver="$Revision: 1.36 $b $Date: 2014/12/28 18:45:18 $a" + local cvsver="$Revision: 1.37 $b $Date: 2015/07/21 02:28:16 $a" echo "locale-gen-${cvsver//: }" exit 0 } @@ -183,7 +183,17 @@ locales_to_generate=$(sed \ -e 's:#.*::' \ -e '/^[[:space:]]*$/d' \ - "${CONFIG}") + "${CONFIG}" | sort) + # Sanity check to make sure people did not duplicate entries. #550884 + dup_locales_to_generate=$( + echo "${locales_to_generate}" | \ + uniq -c | \ + awk '$1 != "1" {$1 = ""; print}') + 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." + locales_to_generate=$(echo "${locales_to_generate}" | uniq) + fi fi if [[ -z ${locales_to_generate} ]] ; then
