From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 16037 invoked by alias); 15 Jun 2012 17:11:50 -0000 Received: (qmail 16016 invoked by uid 22791); 15 Jun 2012 17:11:48 -0000 X-SWARE-Spam-Status: No, hits=-4.6 required=5.0 tests=AWL,BAYES_00,KHOP_RCVD_UNTRUST,KHOP_THREADED,RCVD_IN_HOSTKARMA_W,RCVD_IN_HOSTKARMA_WL X-Spam-Check-By: sourceware.org Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Fri, 15 Jun 2012 17:11:27 +0000 Received: from svr-orw-exc-10.mgc.mentorg.com ([147.34.98.58]) by relay1.mentorg.com with esmtp id 1Sfa3S-0003HN-LY from Carlos_ODonell@mentor.com ; Fri, 15 Jun 2012 10:11:26 -0700 Received: from SVR-ORW-FEM-02.mgc.mentorg.com ([147.34.96.206]) by SVR-ORW-EXC-10.mgc.mentorg.com with Microsoft SMTPSVC(6.0.3790.4675); Fri, 15 Jun 2012 10:10:49 -0700 Received: from [172.30.1.133] (147.34.91.1) by svr-orw-fem-02.mgc.mentorg.com (147.34.96.168) with Microsoft SMTP Server id 14.1.289.1; Fri, 15 Jun 2012 10:11:25 -0700 Message-ID: <4FDB6CBE.10303@mentor.com> Date: Fri, 15 Jun 2012 17:11:00 -0000 From: Carlos O'Donell User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:12.0) Gecko/20120428 Thunderbird/12.0.1 MIME-Version: 1.0 To: Roland McGrath CC: libc-alpha , Subject: Re: [PATCH] Changes to libc.pot for glibc core and ports. References: <4FDB4635.7060306@mentor.com> <20120615165633.112D92C079@topped-with-meat.com> In-Reply-To: <20120615165633.112D92C079@topped-with-meat.com> Content-Type: text/plain; charset="ISO-8859-1" Content-Transfer-Encoding: 7bit Mailing-List: contact libc-ports-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: libc-ports-owner@sourceware.org X-SW-Source: 2012-06/txt/msg00052.txt.bz2 On 6/15/2012 12:56 PM, Roland McGrath wrote: > That is technically not really kosher since nothing says the add-on has to > be under that name. But since list-sources.sh is effectively only for > maintainer use I suppose it's OK. But since it will be moot as soon as > we do the repo consolidation, maybe you should just do it by hand and not > fiddle the script. That's a good point, I'd just assumed that *everyone* symlinks it into the tree as `ports', and that's all I've seen. You are right though that as a maintainer you're expected to follow some documented practice and I've added the assumption under "Regeneration" in the wiki. How about something more robust like? diff --git a/scripts/list-sources.sh b/scripts/list-sources.sh index 53b6f7f..a7d7e34 100755 --- a/scripts/list-sources.sh +++ b/scripts/list-sources.sh @@ -11,8 +11,15 @@ esac if [ -r .git/HEAD ]; then - exec ${GIT:-git} ls-files - + # List files for glibc core. + ${GIT:-git} ls-files + # List files for glibc ports. + ports="ports" + if [ -d "$PWD/$ports" ]; then + cd "$PWD/$ports" + ${GIT:-git} ls-files | sed -e "s,^,$ports/,g" + fi + exit 0 fi echo >&2 'Cannot list sources without some version control system in use.' --- I really hate doing this by hand and leaving no reproducible trace of evidence showing anyone how this was done before. Heaven forbid we don't get the merge done, but say it doesn't happen, then I'd be happier with it just working (tm). Joseph, as always, raised a great point on IRC, that ports shouldn't really be contributing any translatable messages. Translations belong at a higher level and in glibc core. Regardless of this point I don't want to loose a translation, and the latter is a QoI issue that should be independent of our global support for translations. Cheers, Carlos. -- Carlos O'Donell Mentor Graphics / CodeSourcery carlos_odonell@mentor.com carlos@codesourcery.com +1 (613) 963 1026