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 7A8A31387B1 for ; Tue, 31 Dec 2013 04:22:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 95D00E0A7F; Tue, 31 Dec 2013 04:22:13 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A6409E0A7F for ; Tue, 31 Dec 2013 04:22:12 +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 C9C8433F64D for ; Tue, 31 Dec 2013 04:22:11 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 287D8E5532 for ; Tue, 31 Dec 2013 04:22:10 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <1388450375.0a8a5f53e4f3ce1613bd667e98c9d30fd334d3be.dol-sen@gentoo> Subject: [gentoo-commits] proj/catalyst:pending commit in: modules/ X-VCS-Repository: proj/catalyst X-VCS-Files: modules/generic_stage_target.py X-VCS-Directories: modules/ X-VCS-Committer: dol-sen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 0a8a5f53e4f3ce1613bd667e98c9d30fd334d3be X-VCS-Branch: pending Date: Tue, 31 Dec 2013 04:22:10 +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: 71aba452-6e0f-445d-becd-74ab2b12b3f1 X-Archives-Hash: 243ec5748ea66384d1a1c991f886db67 commit: 0a8a5f53e4f3ce1613bd667e98c9d30fd334d3be Author: Brian Dolbec gentoo org> AuthorDate: Sun Dec 29 09:03:14 2013 +0000 Commit: Brian Dolbec gmail com> CommitDate: Tue Dec 31 00:39:35 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=0a8a5f53 Fix mounts and mountmap port_logdir code block. --- modules/generic_stage_target.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py index 51375c0..8f7654e 100644 --- a/modules/generic_stage_target.py +++ b/modules/generic_stage_target.py @@ -4,6 +4,11 @@ from generic_target import * from stat import * import catalyst_lock + +PORT_LOGDIR_CLEAN = \ + 'find "${PORT_LOGDIR}" -type f ! -name "summary.log*" -mtime +30 -delete' + + class generic_stage_target(generic_target): """ This class does all of the chroot setup, copying of files, etc. It is @@ -233,10 +238,10 @@ class generic_stage_target(generic_target): self.env["PATH"]="/usr/lib/icecc/bin:"+self.env["PATH"] if "port_logdir" in self.settings: - self.mounts.append("/var/log/portage") - self.mountmap["/var/log/portage"]=self.settings["port_logdir"] - self.env["PORT_LOGDIR"]="/var/log/portage" - self.env["PORT_LOGDIR_CLEAN"]='find "${PORT_LOGDIR}" -type f ! -name "summary.log*" -mtime +30 -delete' + self.mounts.append("port_logdir") + self.mountmap["port_logdir"] = self.settings["port_logdir"] + self.env["PORT_LOGDIR"] = self.settings["port_logdir"] + self.env["PORT_LOGDIR_CLEAN"] = PORT_LOGDIR_CLEAN def override_cbuild(self): if "CBUILD" in self.makeconf: