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 BACFD1387B1 for ; Fri, 3 Jan 2014 05:03:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 27EE4E0A8A; Fri, 3 Jan 2014 05:03:25 +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 A36D1E0A8A for ; Fri, 3 Jan 2014 05:03:24 +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 C5A8733F587 for ; Fri, 3 Jan 2014 05:03:23 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 52C17E54FB for ; Fri, 3 Jan 2014 05:03:22 +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: <1388723968.4da24c6ed4ae87c4653b051924269915925178f9.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: 4da24c6ed4ae87c4653b051924269915925178f9 X-VCS-Branch: pending Date: Fri, 3 Jan 2014 05:03:22 +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: 5dc9237d-2fcb-498d-8c10-57c62f6366d0 X-Archives-Hash: 2875a389806f0ff38501f3f8bb897cb6 commit: 4da24c6ed4ae87c4653b051924269915925178f9 Author: Brian Dolbec gentoo org> AuthorDate: Sun Dec 29 09:03:14 2013 +0000 Commit: Brian Dolbec gmail com> CommitDate: Fri Jan 3 04:39:28 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=4da24c6e 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 ce43c79..8cc6dc1 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 @@ -234,10 +239,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: 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 18E571387B1 for ; Mon, 6 Jan 2014 02:00:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 59BCDE0BDA; Mon, 6 Jan 2014 02:00:54 +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 F2F17E0BDA for ; Mon, 6 Jan 2014 02:00:53 +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 1CE4833F732 for ; Mon, 6 Jan 2014 02:00:53 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 93832E5534 for ; Mon, 6 Jan 2014 02:00:51 +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: <1388723968.4da24c6ed4ae87c4653b051924269915925178f9.dol-sen@gentoo> Subject: [gentoo-commits] proj/catalyst:master 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: 4da24c6ed4ae87c4653b051924269915925178f9 X-VCS-Branch: master Date: Mon, 6 Jan 2014 02:00:51 +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: 171648fd-6e65-441a-8ef9-6c73e16d43ca X-Archives-Hash: 02b292d30233db82607010060b2188a0 Message-ID: <20140106020051.BPotXx7oB0MvHQ9Kcrw2OPDMejOabwSLB5GlrJLL4yM@z> commit: 4da24c6ed4ae87c4653b051924269915925178f9 Author: Brian Dolbec gentoo org> AuthorDate: Sun Dec 29 09:03:14 2013 +0000 Commit: Brian Dolbec gmail com> CommitDate: Fri Jan 3 04:39:28 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=4da24c6e 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 ce43c79..8cc6dc1 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 @@ -234,10 +239,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: