| 1 |
On Fri, 2013-12-13 at 22:59 -0600, Dustin C. Hatch wrote: |
| 2 |
> On 12/13/2013 21:07, Brian Dolbec wrote: |
| 3 |
> > --- |
| 4 |
> > modules/generic_stage_target.py | 6 +++--- |
| 5 |
> > 1 file changed, 3 insertions(+), 3 deletions(-) |
| 6 |
> > |
| 7 |
> > diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py |
| 8 |
> > index 342c65b..1fbc733 100644 |
| 9 |
> > --- a/modules/generic_stage_target.py |
| 10 |
> > +++ b/modules/generic_stage_target.py |
| 11 |
> > @@ -1066,9 +1066,9 @@ class generic_stage_target(generic_target): |
| 12 |
> > "/use will cause portage to ignore" |
| 13 |
> > print "\tpackage.use in the profile and portage_confdir. You've been warned!" |
| 14 |
> > |
| 15 |
> > - myf.write('PORTDIR="/usr/portage"\n') |
| 16 |
> > - myf.write('DISTDIR="${PORTDIR}/distfiles"\n') |
| 17 |
> > - myf.write('PKGDIR="${PORTDIR}/packages"\n') |
| 18 |
> > + myf.write('PORTDIR="%s"\n' % self.settings['portdir']) |
| 19 |
> > + myf.write('DISTDIR="%s"\n' % self.settings['distdir']) |
| 20 |
> > + myf.write('PKGDIR="%s"\n' % self.settings['packagedir']) |
| 21 |
> > |
| 22 |
> > """ Setup the portage overlay """ |
| 23 |
> > if "portage_overlay" in self.settings: |
| 24 |
> > |
| 25 |
> Do we need to still do this? Since the default location isn't hardcoded |
| 26 |
> anymore, but set in repos.conf, it can be confusing if PORTDIR is set in |
| 27 |
> make.conf, because it doesn't even get used. |
| 28 |
> |
| 29 |
|
| 30 |
This patch is to fix recent commits to master that conflicted with |
| 31 |
commits done in the rewrite branch 1 year ago. All this coding was done |
| 32 |
long before the recent repos.conf changes shoved on us. There are lots |
| 33 |
more changes to come. If at that time, if things are settled, then it |
| 34 |
will be time to update for the repos.conf mess imposed on us. |
Archives