diff options
| author | Adam Coldrick <adam.coldrick@codethink.co.uk> | 2014-06-30 13:22:04 +0000 |
|---|---|---|
| committer | Adam Coldrick <adam.coldrick@codethink.co.uk> | 2014-06-30 13:22:04 +0000 |
| commit | 68ceb2f827aaa5fcec9902a18331f2a1e2226ed1 (patch) | |
| tree | ce2ab16eec2161b10c58085652e9d94e37824e92 | |
| parent | 633391eac9bdbe5b09d4ec02d3da0713221dce82 (diff) | |
| download | morph-68ceb2f827aaa5fcec9902a18331f2a1e2226ed1.tar.gz | |
Unset the defaults we set
| -rw-r--r-- | morphlib/morphloader.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/morphlib/morphloader.py b/morphlib/morphloader.py index e1447044..061d2959 100644 --- a/morphlib/morphloader.py +++ b/morphlib/morphloader.py @@ -721,6 +721,10 @@ class MorphologyLoader(object): del spec['repo'] if 'morph' in spec and spec['morph'] == spec['name']: del spec['morph'] + if 'build-mode' in spec and spec['build-mode'] == 'staging': + del spec['build-mode'] + if 'prefix' in spec and spec['prefix'] == '/usr': + del spec['prefix'] self._unset_stratum_specs_defaults(morph, 'strata') def _set_chunk_defaults(self, morph): |