diff options
| author |   Paul Eggleton <paul.eggleton@linux.intel.com> | 2016-11-07 11:12:21 +1300 |
|---|---|---|
| committer | Paul Eggleton <paul.eggleton@linux.intel.com> | 2016-11-07 16:39:38 +1300 |
| commit | 05f3bccbc600a4b5a22ae356cd9b74537eda143d (patch) | |
| tree | 161606c127cb0b1ab02e643da4a38cef0221ae54 /layerindex/layerconfparse.py | |
| parent | e547528fd37a30e178bb92e4d14821f61f09c0c5 (diff) | |
| download | openembedded-core-contrib-05f3bccbc600a4b5a22ae356cd9b74537eda143d.tar.gz | |
update_layer: fix regressions in missing layer detection
If a layer is removed by its subdirectory being deleted then we want to
pick up on that and produce an appropriate error message - so let the
layer_update code do the checking out and verifying things are correct
before trying to parse layer.conf.
This also fixes --nocheckout still checking out a branch.
Additionally, drop some code that gets the layerbranch which we just
retrieved a few lines above.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Diffstat (limited to 'layerindex/layerconfparse.py')
| -rw-r--r-- | layerindex/layerconfparse.py | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/layerindex/layerconfparse.py b/layerindex/layerconfparse.py index 3a453bd156..d599ed56b1 100644 --- a/layerindex/layerconfparse.py +++ b/layerindex/layerconfparse.py @@ -34,9 +34,6 @@ class LayerConfParse: def parse_layer(self, layerbranch, layerdir): - utils.checkout_layer_branch(layerbranch, layerdir, self.logger) - - # This is not a valid layer, parsing will cause exception. if not utils.is_layer_valid(layerdir): return None |