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 66DC2138247 for ; Wed, 22 Jan 2014 05:04:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 97347E1184; Wed, 22 Jan 2014 05:04:16 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E0A7EE117A for ; Wed, 22 Jan 2014 05:04:15 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 22D1C33F077 for ; Wed, 22 Jan 2014 05:04:15 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 0918E187CD for ; Wed, 22 Jan 2014 05:04:13 +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: <1390365023.59f782fb182510a86bbb5b120083b93b90cf7a80.dol-sen@gentoo> Subject: [gentoo-commits] proj/catalyst:3.0 commit in: catalyst/, catalyst/base/ X-VCS-Repository: proj/catalyst X-VCS-Files: catalyst/base/stagebase.py catalyst/defaults.py X-VCS-Directories: catalyst/ catalyst/base/ X-VCS-Committer: dol-sen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 59f782fb182510a86bbb5b120083b93b90cf7a80 X-VCS-Branch: 3.0 Date: Wed, 22 Jan 2014 05:04:13 +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: 66681b49-ae34-4fc3-b9bb-4ac42d514336 X-Archives-Hash: df9a49b713457e4c627e4385c2c48472 commit: 59f782fb182510a86bbb5b120083b93b90cf7a80 Author: Brian Dolbec gentoo org> AuthorDate: Sun Dec 29 09:03:14 2013 +0000 Commit: Brian Dolbec gmail com> CommitDate: Wed Jan 22 04:30:23 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=59f782fb Fix mounts and mountmap port_logdir code block. Conflicts: catalyst/base/stagebase.py --- catalyst/base/stagebase.py | 9 +++++---- catalyst/defaults.py | 3 +++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py index 10868ee..3021620 100644 --- a/catalyst/base/stagebase.py +++ b/catalyst/base/stagebase.py @@ -13,7 +13,8 @@ from catalyst.support import (CatalystError, msg, file_locate, normpath, from catalyst.base.targetbase import TargetBase from catalyst.base.clearbase import ClearBase from catalyst.base.genbase import GenBase -from catalyst.defaults import TARGET_MOUNT_DEFAULTS, SOURCE_MOUNT_DEFAULTS +from catalyst.defaults import (TARGET_MOUNT_DEFAULTS, SOURCE_MOUNT_DEFAULTS, + PORT_LOGDIR_CLEAN) from catalyst.lock import LockDir from catalyst.fileops import ensure_dirs, pjoin from catalyst.base.resume import AutoResume @@ -253,9 +254,9 @@ class StageBase(TargetBase, ClearBase, GenBase): if "port_logdir" in self.settings: 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"]='find "${PORT_LOGDIR}" -type f ! -name "summary.log*" -mtime +30 -delete' + 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: diff --git a/catalyst/defaults.py b/catalyst/defaults.py index 1f86c1d..59941ee 100644 --- a/catalyst/defaults.py +++ b/catalyst/defaults.py @@ -105,6 +105,9 @@ SOURCE_MOUNT_DEFAULTS = { "shm": "shmfs", } +PORT_LOGDIR_CLEAN = \ + 'find "${PORT_LOGDIR}" -type f ! -name "summary.log*" -mtime +30 -delete' + # legend: key: message option_messages = { "autoresume": "Autoresuming support enabled.",