Author: kmachalkova Date: Tue Jun 19 14:34:51 2007 New Revision: 38521 URL: http://svn.opensuse.org/viewcvs/yast?rev=38521&view=rev Log: Err, s/||/&&/ Modified: trunk/yast2/scripts/yast2 Modified: trunk/yast2/scripts/yast2 URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/scripts/yast2?rev=38521&r1=38520&r2=38521&view=diff ============================================================================== --- trunk/yast2/scripts/yast2 (original) +++ trunk/yast2/scripts/yast2 Tue Jun 19 14:34:51 2007 @@ -273,7 +273,7 @@ # so strip any possible suffix from locale and append .UTF-8 elif [ "$UTF8TESTED" == "1" ] && [ $UTF8STATUS -eq 2 ]; then #do not append .UTF-8 suffix to POSIX and C locale (#285178) - if [ "$LANG" != "POSIX" ] || [ $LANG != "C" ]; then + if [ "$LANG" != "POSIX" ] && [ $LANG != "C" ]; then /usr/bin/test -n "$LANG" && LANG=${LANG%%[.@]*}.UTF-8 /usr/bin/test -n "$LC_CTYPE" && LC_CTYPE=${LC_CTYPE%%[.@]*}.UTF-8 fi -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org