From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 1620F138010 for ; Mon, 29 Oct 2012 20:36:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B391D21C0EF; Mon, 29 Oct 2012 20:35:50 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 3B44C21C0EF for ; Mon, 29 Oct 2012 20:35:50 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9E52B33D87A for ; Mon, 29 Oct 2012 20:35:49 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 3E655E5441 for ; Mon, 29 Oct 2012 20:35:48 +0000 (UTC) From: "Anthony G. Basile" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Anthony G. Basile" Message-ID: <1351542651.d647a08e7b0369c4479d9a8ada3c55ea047f165b.blueness@gentoo> Subject: [gentoo-commits] proj/catalyst:master commit in: modules/ X-VCS-Repository: proj/catalyst X-VCS-Files: modules/stage1_target.py X-VCS-Directories: modules/ X-VCS-Committer: blueness X-VCS-Committer-Name: Anthony G. Basile X-VCS-Revision: d647a08e7b0369c4479d9a8ada3c55ea047f165b X-VCS-Branch: master Date: Mon, 29 Oct 2012 20:35:48 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: c8905f08-21d1-4c04-9e7e-3e08089cf6a2 X-Archives-Hash: bec66207f6b6c6ba5e3015b0d10024c8 commit: d647a08e7b0369c4479d9a8ada3c55ea047f165b Author: Anthony G. Basile gentoo org> AuthorDate: Mon Oct 29 20:30:51 2012 +0000 Commit: Anthony G. Basile gentoo org> CommitDate: Mon Oct 29 20:30:51 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=d647a08e Do not break autopoint by cleaning out /usr/share/gettext in stage1 The problem comes in stage3 when you have packages that inherit autotools.eclass. The eclass may make use of gettext and run autopoint which will fail if it doesn't find /usr/share/gettext/archive.dir.tar.gz. X-Gentoo-Bug: 439636 X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=439636 Signed-off-by: Anthony G. Basile gentoo.org> The fix is to remove /usr/share/gettext from the list of stage1 cleanables. --- modules/stage1_target.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/stage1_target.py b/modules/stage1_target.py index b97bd89..0a93c88 100644 --- a/modules/stage1_target.py +++ b/modules/stage1_target.py @@ -28,7 +28,7 @@ class stage1_target(generic_stage_target): def set_cleanables(self): generic_stage_target.set_cleanables(self) - self.settings["cleanables"].extend(["/usr/share/gettext",\ + self.settings["cleanables"].extend([\ "/usr/lib/python2.2/test", "/usr/lib/python2.2/email",\ "/usr/lib/python2.2/lib-tk", "/usr/lib/python2.3/test",\ "/usr/lib/python2.3/email", "/usr/lib/python2.3/lib-tk",\