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 ED61D138247 for ; Sat, 14 Dec 2013 22:25:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 682DBE0AEB; Sat, 14 Dec 2013 22:24:47 +0000 (UTC) Received: from QMTA11.westchester.pa.mail.comcast.net (qmta11.westchester.pa.mail.comcast.net [76.96.59.211]) by pigeon.gentoo.org (Postfix) with ESMTP id 4C2B9E0B13 for ; Sat, 14 Dec 2013 22:24:46 +0000 (UTC) Received: from omta07.westchester.pa.mail.comcast.net ([76.96.62.59]) by QMTA11.westchester.pa.mail.comcast.net with comcast id 1Zx21n0021GhbT85BaQlco; Sat, 14 Dec 2013 22:24:45 +0000 Received: from odin.tremily.us ([24.18.63.50]) by omta07.westchester.pa.mail.comcast.net with comcast id 1aQk1n00o152l3L3TaQlxC; Sat, 14 Dec 2013 22:24:45 +0000 Received: by odin.tremily.us (Postfix, from userid 1000) id B0FC6D68B2F; Sat, 14 Dec 2013 14:24:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tremily.us; s=odin; t=1387059883; bh=DEKSOITdGlmG3lWrPp5SdsNRYo/VMPnXn7STDk3MecE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:In-Reply-To: References; b=GnDx3m4/+nlw8enyyjW40KKzHZnrOQDZwNqN09Rp8bpLdFMYQNsSHuNl+msveuYzR TEgXGfvtKVA7PVV8qclzTd6A5myRWdlBzgr4btDpFLCdUga44D4wG0brkiYeVX7jLH GcGYp1cTwy/K+Z2qEs5HKGfpgcd+/MnNFOZGlY8s= From: "W. Trevor King" To: Catalyst Cc: Brian Dolbec , "W. Trevor King" Subject: [gentoo-catalyst] [PATCH v2 05/21] modules/generic_stage_target.py: Use a 'local_overlay' setting instead of hard-coding '/usr/local/portage' Date: Sat, 14 Dec 2013 14:24:13 -0800 Message-Id: <37bc379c3c98d8d820ec7efb651e65147505d295.1387059467.git.wking@tremily.us> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: References: In-Reply-To: References: DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=comcast.net; s=q20121106; t=1387059885; bh=EtQhLNxdXNEM/pBLAAzjJ054tN1NT94IrSHGTQoG8FI=; h=Received:Received:Received:From:To:Subject:Date:Message-Id; b=JHo9YiL77qnOPFbSrLrtCzJ47hB0C/brIaduM1RKI4cX81f5YQWrZfj//sakedDYb SeQP7yJvMA8Sahzuhm643rQIO2chsB/JM4ma2EvGu3rCqGXaLJ/0orGWZbypN/lW3q AkrIiVVoF/2MglCE6JY9tyMXUliJ2F3t3COTPE3zp9p6jzct9AXtQUuox4nG1yYA7Z HoZ8d5lzt5Oyo97yukkihOgLQv0ljswyzFuO2X69bzFnKkjJ1mRK0VM7IpANlDSpVY zFG1mZJUDTS7a0dZilwtwEVG6gTeDD18fVeTOdbkPzWtSTIiX7dwRDhGs/CHA9ETw1 WMfcKt0zMTEuQ== 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: 3411842d-0fe6-4499-a071-7a68c2de5bd4 X-Archives-Hash: ec58f37f6d7a98f425f79726ba566a49 From: Brian Dolbec W. Trevor King: Refactored Git history for Brian Dolbec's content changes. Signed-off-by: W. Trevor King --- 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