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 2B5A2138247 for ; Sun, 15 Dec 2013 04:00:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 72E7CE0AF2; Sun, 15 Dec 2013 04:00:56 +0000 (UTC) Received: from qmta14.westchester.pa.mail.comcast.net (qmta14.westchester.pa.mail.comcast.net [76.96.59.212]) by pigeon.gentoo.org (Postfix) with ESMTP id F089CE0AF2 for ; Sun, 15 Dec 2013 04:00:55 +0000 (UTC) Received: from omta03.westchester.pa.mail.comcast.net ([76.96.62.27]) by qmta14.westchester.pa.mail.comcast.net with comcast id 1g0E1n0010bG4ec5Eg0v70; Sun, 15 Dec 2013 04:00:55 +0000 Received: from odin.tremily.us ([24.18.63.50]) by omta03.westchester.pa.mail.comcast.net with comcast id 1g0u1n009152l3L3Pg0vUu; Sun, 15 Dec 2013 04:00:55 +0000 Received: by odin.tremily.us (Postfix, from userid 1000) id 18762D6993F; 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=jJfZz1xrHIU7CqZFxSm60MvrEaRT4HLybJGdyccMcXw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:In-Reply-To: References; b=ZL88jfGTZvIeZbOW6cbCSL2EoW8Fe6xv9bD0W0UjPeZu0JByvrHwGsknhYfXme3hq qPEj2UofeoaW4XN3G6wOaDa+09DJmSXGY3YUxKFG12as8Npr0kE5Re+3oFZQJixist 4+BDArVsBQqP7oa5+J5O1VKswbrYuvUQdw3J42yo= From: "W. Trevor King" To: Catalyst Cc: Brian Dolbec , "W. Trevor King" Subject: [gentoo-catalyst] [PATCH v3 02/19] modules/generic_stage_target.py: Use 'portdir' instead of hard-coding '/usr/portage' Date: Sat, 14 Dec 2013 20:00:28 -0800 Message-Id: <6b924669b51bb8efbc344c51172eec488515c869.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=1387080055; bh=eKTd0ELfs9LysDeXyRZqnOn7urNXOknBfjOmLfM1Kmg=; h=Received:Received:Received:From:To:Subject:Date:Message-Id; b=Y7kl7330HYvsfSC2MLwTknpSWwH3NymeaLyMNWnPSzEB3ywWjjoJuBYR3piBmXYk0 AaPLsQLqxttQQqo9y+ZF9aDIwwgUGFtOhEmnxvk1nqnMeZDdJWLqN7daPbmf/2rUEO fnXGf2nDK8Bf9lvMd/GJdUw8wWfJeOwJef0BwSAlXBoFtWv3LFB2HB1gwzt4D8ztOA O1MdAnti1toVo/PSfO+k6FByfgqHYEfFv1aZDSdBzeYYDtRCoahn4SGv3vNrU8BZ2X tXUFwcXFmFzVksM+oynDzrqNNMmLNw43ivn2B0WEfTIGGA5Gz886Y05KgFTxQEyKkK AZyBBq6H1Eh9w== 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: ae27fda5-64bf-4123-aede-800bbeccd5bd X-Archives-Hash: 0302f61a52e801aa49ff2c7fbec8241a 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 | 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