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 9A9DD138247 for ; Sun, 15 Dec 2013 04:10:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 29A1DE0B3D; Sun, 15 Dec 2013 04:10:47 +0000 (UTC) Received: from qmta01.westchester.pa.mail.comcast.net (qmta01.westchester.pa.mail.comcast.net [76.96.62.16]) by pigeon.gentoo.org (Postfix) with ESMTP id 6E212E0B36 for ; Sun, 15 Dec 2013 04:10:46 +0000 (UTC) Received: from omta05.westchester.pa.mail.comcast.net ([76.96.62.43]) by qmta01.westchester.pa.mail.comcast.net with comcast id 1g9k1n0040vyq2s51gAmV2; Sun, 15 Dec 2013 04:10:46 +0000 Received: from odin.tremily.us ([24.18.63.50]) by omta05.westchester.pa.mail.comcast.net with comcast id 1gAk1n00K152l3L3RgAljk; Sun, 15 Dec 2013 04:10:46 +0000 Received: by odin.tremily.us (Postfix, from userid 1000) id ACD24D6994E; Sat, 14 Dec 2013 20:00:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tremily.us; s=odin; t=1387080054; bh=zNg86Tb8drvZyrv8sioX5wnAFEVn2etcsv/+RZgR34E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:In-Reply-To: References; b=UAOOyCKfHV8PDJGHac4hlDQ+GyVbA3LVSxfsgfDLYyK8qAmlcwKpoT8NnVllAzUtB 9ObN7iGsCKiEXD1zra+aUCFaatyGq5J1ZxZC+cAcxbYLsQhS/z8sSjnpsSRAS82bFy HRs0uJKzCahDFV463BciP6ZckmC8wuN0F7e7Jhzk= From: "W. Trevor King" To: Catalyst Cc: Brian Dolbec , "W. Trevor King" Subject: [gentoo-catalyst] [PATCH v3 05/19] modules/generic_stage_target.py: Use a 'local_overlay' setting instead of hard-coding '/usr/local/portage' Date: Sat, 14 Dec 2013 20:00:31 -0800 Message-Id: <5d209c503d6d56c3de9272150b7c6144e252fdbb.1387079534.git.wking@tremily.us> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: References: <20131215032258.GK25409@odin.tremily.us> In-Reply-To: References: DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=comcast.net; s=q20121106; t=1387080646; bh=XikauxqdFhGZwFRq8Yvg1RbRwfy+I6Rpe9Xf8lOj3jQ=; h=Received:Received:Received:From:To:Subject:Date:Message-Id; b=ZfJXtw70Jwgoln/6d5uN++snzZcvIPnHZdRGrVBVuZSSnPQMksKscwo42AJLOiyqy vwrp61Og/3LO6EtC34md5Fx5odbdjuH5pbYw1TW5iu0qX4WMNg8xF0qH05o3nnF/5f TSxzbLsxDRpANcBYqTU3LUZx1rr78ZgFO6FNHs5BtKZu7q+rFSwaXT4z9nNzNiPfs2 UAtVMhJPhh/6sRsB6vySBpiblpExjkq8JpA+wLJq9TvW2uY7plkc7ZZTV485C69z3M zzKDsE5LJ7glmgzqt+uF8I3W+CUmGzG6giDBfmfYOVABbFY0Uld9WiSW1KjRmGMltu 0VRcJfDcyxPww== Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-catalyst@lists.gentoo.org Reply-to: gentoo-catalyst@lists.gentoo.org X-Archives-Salt: 2601e6e8-5fd0-410b-bd79-d2765bdf0bda X-Archives-Hash: c837c650fddce4ca92d5e094f0f11662 From: Brian Dolbec W. Trevor King: Refactored Git history for Brian Dolbec's content changes. Signed-off-by: W. Trevor King Signed-off-by: Brian Dolbec --- modules/generic_stage_target.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py index fc54fbf..6ee35d2 100644 --- a/modules/generic_stage_target.py +++ b/modules/generic_stage_target.py @@ -872,10 +872,10 @@ class generic_stage_target(generic_target): if os.path.exists(x): print "Copying overlay dir " +x cmd("mkdir -p "+self.settings["chroot_path"]+\ - "/usr/local/portage",\ + self.settings["local_overlay"],\ "Could not make portage_overlay dir",env=self.env) cmd("cp -R "+x+"/* "+self.settings["chroot_path"]+\ - "/usr/local/portage",\ + self.settings["local_overlay"],\ "Could not copy portage_overlay",env=self.env) def root_overlay(self): @@ -1116,9 +1116,9 @@ class generic_stage_target(generic_target): "Could not replace /etc/hosts",env=self.env) """ Remove our overlay """ - if os.path.exists(self.settings["chroot_path"]+"/usr/local/portage"): - cmd("rm -rf "+self.settings["chroot_path"]+"/usr/local/portage",\ - "Could not remove /usr/local/portage",env=self.env) + if os.path.exists(self.settings["chroot_path"] + self.settings["local_overlay"]): + cmd("rm -rf " + self.settings["chroot_path"] + self.settings["local_overlay"], + "Could not remove " + self.settings["local_overlay"], env=self.env) cmd("sed -i '/^PORTDIR_OVERLAY/d' "+self.settings["chroot_path"]+\ "/etc/portage/make.conf",\ "Could not remove PORTDIR_OVERLAY from make.conf",env=self.env) -- 1.8.3.2