Return-Path: Delivered-To: apmail-incubator-stdcxx-dev-archive@www.apache.org Received: (qmail 43143 invoked from network); 17 Aug 2006 14:15:39 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 17 Aug 2006 14:15:39 -0000 Received: (qmail 59180 invoked by uid 500); 17 Aug 2006 14:15:39 -0000 Delivered-To: apmail-incubator-stdcxx-dev-archive@incubator.apache.org Received: (qmail 59102 invoked by uid 500); 17 Aug 2006 14:15:39 -0000 Mailing-List: contact stdcxx-dev-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: stdcxx-dev@incubator.apache.org Delivered-To: mailing list stdcxx-dev@incubator.apache.org Received: (qmail 59091 invoked by uid 99); 17 Aug 2006 14:15:39 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 17 Aug 2006 07:15:39 -0700 X-ASF-Spam-Status: No, hits=0.0 required=10.0 tests= X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [212.82.213.172] (HELO exkiv.kyiv.vdiweb.com) (212.82.213.172) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 17 Aug 2006 07:15:38 -0700 Received: from [10.11.37.198] ([10.11.37.198]) by exkiv.kyiv.vdiweb.com with Microsoft SMTPSVC(6.0.3790.1830); Thu, 17 Aug 2006 17:15:32 +0300 Message-ID: <44E47A03.8050002@kyiv.vdiweb.com> Date: Thu, 17 Aug 2006 17:15:31 +0300 From: Farid Zaripov User-Agent: Thunderbird 1.5.0.5 (Windows/20060719) MIME-Version: 1.0 To: stdcxx-dev@incubator.apache.org Subject: [PATCH] run_locale_utils.sh Content-Type: multipart/mixed; boundary="------------040908020909020905080107" X-OriginalArrivalTime: 17 Aug 2006 14:15:32.0488 (UTC) FILETIME=[99A45080:01C6C207] X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N --------------040908020909020905080107 Content-Type: text/plain; charset=KOI8-R; format=flowed Content-Transfer-Encoding: 7bit Attached is a patch for run_locale_utils.sh script. If locale name is like lang_enc@sublang then locale src file name should be lang.sublang instead of lang@sublang. ChangeLog: * run_locale_utils.sh (test_locale): Corrected generation of the locale src file name. ------------------------ # ./sr_YU.ISO-8859-5@cyrillic.sh -d RWSTD_SRC_ROOT=/usr/src/WorkingCopy/etc/nls export RWSTD_SRC_ROOT RWSTD_LOCALE_ROOT=/tmp/locale.8599 export RWSTD_LOCALE_ROOT ./localedef -w -c -f /usr/src/WorkingCopy/etc/nls/charmaps/ISO-8859-5 -i /usr/src/WorkingCopy/etc/nls/src/sr_YU@cyrillic /tmp/locale.8599/sr_YU.ISO-8859-5@cyrillic 2>/dev/tty Error 500: /usr/src/WorkingCopy/etc/nls/src/sr_YU@cyrillic could not be opened for reading Error - localedef returned code: 4 ------------------------ Farid. --------------040908020909020905080107 Content-Type: text/plain; name="run_locale_utils.sh.diff" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="run_locale_utils.sh.diff" Index: run_locale_utils.sh =================================================================== --- run_locale_utils.sh (revision 432164) +++ run_locale_utils.sh (working copy) @@ -232,7 +232,7 @@ # get locale's name and encoding locale_src=`echo $3 | \ - sed -n "s:\([^\.]*\)\.\([^\.\@]*\)\(.*\):\1\3:p;s:\@$::g"`; + sed -n "s:\([^\.]*\)\.\([^\.\@]*\)\(.*\):\1\3:p" | tr "@" "."`; locale_encoding=`echo $3 | \ sed -n "s:\([^\.]*\)\.\([^\.\@]*\)\(.*\):\2:p"`; --------------040908020909020905080107--