From: Brian Dolbec <[email protected]>

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

Signed-off-by: W. Trevor King <[email protected]>
---
 catalyst                        | 1 +
 modules/generic_stage_target.py | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/catalyst b/catalyst
index 131529a..c62b745 100755
--- a/catalyst
+++ b/catalyst
@@ -65,6 +65,7 @@ def parse_config(myconfig):
                "distdir": "/usr/portage/distfiles",
                "hash_function": "crc32",
                "options": "",
+               "packagedir": "/usr/portage/packages",
                "portdir": "/usr/portage",
                "repo_name": "portage",
                "sharedir": "/usr/share/catalyst",
diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py
index 63661fe..c890773 100644
--- a/modules/generic_stage_target.py
+++ b/modules/generic_stage_target.py
@@ -1068,7 +1068,7 @@ class generic_stage_target(generic_target):
 
                        myf.write('PORTDIR="%s"\n' % self.settings['portdir'])
                        myf.write('DISTDIR="%s"\n' % self.settings['distdir'])
-                       myf.write('PKGDIR="${PORTDIR}/packages"\n')
+                       myf.write('PKGDIR="%s"\n' % self.settings['packagedir'])
 
                        """ Setup the portage overlay """
                        if "portage_overlay" in self.settings:
-- 
1.8.3.2


Reply via email to