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 A0DE3138247 for ; Sat, 14 Dec 2013 22:24:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 942A4E0B20; Sat, 14 Dec 2013 22:24:46 +0000 (UTC) Received: from qmta04.westchester.pa.mail.comcast.net (qmta04.westchester.pa.mail.comcast.net [76.96.62.40]) by pigeon.gentoo.org (Postfix) with ESMTP id 73394E0B07 for ; Sat, 14 Dec 2013 22:24:45 +0000 (UTC) Received: from omta03.westchester.pa.mail.comcast.net ([76.96.62.27]) by qmta04.westchester.pa.mail.comcast.net with comcast id 1ZV41n0040bG4ec54aQl49; Sat, 14 Dec 2013 22:24:45 +0000 Received: from odin.tremily.us ([24.18.63.50]) by omta03.westchester.pa.mail.comcast.net with comcast id 1aQj1n00Q152l3L3PaQkp8; Sat, 14 Dec 2013 22:24:44 +0000 Received: by odin.tremily.us (Postfix, from userid 1000) id 1ECB4D68B20; Sat, 14 Dec 2013 14:24:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tremily.us; s=odin; t=1387059883; bh=CZAbXJ7K+z+Z0C9UgEJLjdue/EpiAzp6NCPrvz35zXU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:In-Reply-To: References; b=tHyIL9g4vZ+hkGeuCsNhFH2PV1db5f4Nq3anD9Ps1BuuMtue8ayfskhyZdjq/xk4V vWZUT5ldEQOjjAKk3ZaUeDUfKexLZI3MEXPwj9DhKIlREfPNgeofTMC5o7maIWxaw3 o9AINQAhc2p60Iur6UE8Cy1YsZsoDdkwMDSQ8cxI= From: "W. Trevor King" To: Catalyst Cc: Brian Dolbec , "W. Trevor King" Subject: [gentoo-catalyst] [PATCH v2 02/21] modules/generic_stage_target.py: Use 'portdir' instead of hard-coding '/usr/portage' Date: Sat, 14 Dec 2013 14:24:10 -0800 Message-Id: <3042533c708bec106a64081ed29583294cd22277.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=Bp06v2fyPWOMw27dwX8docw1jf0i6CKwyi7JP6ugIug=; h=Received:Received:Received:From:To:Subject:Date:Message-Id; b=ToQaNAAELwLvgkOvc+pcx1QSfRD13TpX6CHMgrBVJCq/GlFXm+vSlF0v/RfSUqgzT 5UghLFW+eHTLgv00xU6xM/LNFuF+TQ7BwTO/ZGDBitYyGD0/Uu4vXzwCOl6xluq54d yIOgQ79YtdMzrEKK1e/wUukBSMKin68m3Sk6G4rMnxiidrsOF7kGWX/JKw3Nl8G1Qc 34HqeghWI3JFVSYdzXwF3U7sRSfj8OTMQfB8S518t5iE9sKQh5DZNowN1SPvk1dyAs gGaC9JS2bSscDx/HcmnjavNjs+1ojp0HzagFSkDCKNem2ZEEI0w7d5qbWmOjUMwbEo Pc6SXhLuAyznw== 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: 6a064d40-6573-41c5-9c68-2fc8148f0322 X-Archives-Hash: 502dd9df491dde6c0d7462af1419dc66 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 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py index 848aca2..0871cba 100644 --- a/modules/generic_stage_target.py +++ b/modules/generic_stage_target.py @@ -406,7 +406,7 @@ class generic_stage_target(generic_target): def set_cleanables(self): self.settings["cleanables"]=["/etc/resolv.conf","/var/tmp/*","/tmp/*",\ - "/root/*","/usr/portage"] + "/root/*", self.settings["portdir"]] def set_snapshot_path(self): self.settings["snapshot_path"]=normpath(self.settings["storedir"]+\ @@ -785,7 +785,7 @@ class generic_stage_target(generic_target): print "Valid snapshot cache, skipping unpack of portage tree..." unpack=False else: - destdir=normpath(self.settings["chroot_path"]+"/usr/portage") + destdir = normpath(self.settings["chroot_path"] + self.settings["portdir"]) cleanup_errmsg="Error removing existing snapshot directory." cleanup_msg=\ "Cleaning up existing portage tree (This can take a long time)..." @@ -799,7 +799,7 @@ class generic_stage_target(generic_target): if "AUTORESUME" in self.settings \ and os.path.exists(self.settings["chroot_path"]+\ - "/usr/portage/") \ + self.settings["portdir"]) \ and os.path.exists(self.settings["autoresume_path"]\ +"unpack_portage") \ and self.settings["snapshot_path_hash"] == snapshot_hash: @@ -846,7 +846,7 @@ class generic_stage_target(generic_target): cmd("rm -f "+self.settings["chroot_path"]+"/etc/portage/make.profile",\ "Error zapping profile link",env=self.env) cmd("mkdir -p "+self.settings["chroot_path"]+"/etc/portage/") - cmd("ln -sf ../../usr/portage/profiles/"+\ + cmd("ln -sf ../.." + self.settings["portdir"] + "/profiles/" + \ self.settings["target_profile"]+" "+\ self.settings["chroot_path"]+"/etc/portage/make.profile",\ "Error creating profile link",env=self.env) -- 1.8.3.2