diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2013-02-25 10:13:34 +0000 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2013-03-13 15:20:02 +0000 |
| commit | 0cc3de60d6282d22108ea59f169a0749be5e59ea (patch) | |
| tree | 2bef9ed79c0b4d9e128b3095e72ccce4a525a532 /morphlib/stagingarea.py | |
| parent | 84807d4d7c23f45d4f0a0f87e6c7ba7ba7470936 (diff) | |
| download | morph-0cc3de60d6282d22108ea59f169a0749be5e59ea.tar.gz | |
Add 'prefix' property for chunks within strata
Morph no longer supports setting the prefix using the --prefix
argument / setting. This was only used in tests and during bootstrap.
If a chunk build-depends on a chunk within a stratum which has
a custom prefix, that prefix is appended to the PATH in the build
environment.
Diffstat (limited to 'morphlib/stagingarea.py')
| -rw-r--r-- | morphlib/stagingarea.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/morphlib/stagingarea.py b/morphlib/stagingarea.py index 24b72867..de29eede 100644 --- a/morphlib/stagingarea.py +++ b/morphlib/stagingarea.py @@ -51,9 +51,9 @@ class StagingArea(object): self.env.update(extra_env) if use_chroot: - path = build_env.extra_path + self._base_path + path = extra_path + build_env.extra_path + self._base_path else: - rel_path = build_env.extra_path + rel_path = extra_path + build_env.extra_path full_path = [os.path.normpath(dirname + p) for p in rel_path] path = full_path + os.environ['PATH'].split(':') self.env['PATH'] = ':'.join(path) |