From: Brian Dolbec <dolsen@gentoo.org>
Date: Fri, 22 Nov 2013 04:51:13 +0000 (-0800)
Subject: modules/generic_stage_target.py: Use 'portdir' instead of hard-coding '/usr/portage'
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b5fb1937d5da5a2befe756dfe93eb6cdb2135892;p=catalyst.git

modules/generic_stage_target.py: Use 'portdir' instead of hard-coding '/usr/portage'

W. Trevor King: Refactored Git history for Brian Dolbec's content changes.

Reviewed-by: Matt Turner <mattst88@gentoo.org>
Signed-off-by: W. Trevor King <wking@tremily.us>
Signed-off-by: Brian Dolbec <dolsen@gentoo.org>
---

diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py
index 0871cba8..0803a8c3 100644
--- a/modules/generic_stage_target.py
+++ b/modules/generic_stage_target.py
@@ -1064,7 +1064,7 @@ class generic_stage_target(generic_target):
 						"/use will cause portage to ignore"
 					print "\tpackage.use in the profile and portage_confdir. You've been warned!"
 
-			myf.write('PORTDIR="/usr/portage"\n')
+			myf.write('PORTDIR="%s"\n' % self.settings['portdir'])
 			myf.write('DISTDIR="${PORTDIR}/distfiles"\n')
 			myf.write('PKGDIR="${PORTDIR}/packages"\n')