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/update.py | |
| parent | e547528fd37a30e178bb92e4d14821f61f09c0c5 (diff) | |
| download | openembedded-core-contrib-05f3bccbc600a4b5a22ae356cd9b74537eda143d.tar.gz openembedded-core-contrib-05f3bccbc600a4b5a22ae356cd9b74537eda143d.tar.bz2 openembedded-core-contrib-05f3bccbc600a4b5a22ae356cd9b74537eda143d.zip | |
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/update.py')
| -rwxr-xr-x | layerindex/update.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/layerindex/update.py b/layerindex/update.py index ffa2a62b61..060810de63 100755 --- a/layerindex/update.py +++ b/layerindex/update.py @@ -226,9 +226,7 @@ def main(): urldir = layer.get_fetch_dir() repodir = os.path.join(fetchdir, urldir) - layerbranch = layer.get_layerbranch(branch) - if not layerbranch: - continue + utils.checkout_layer_branch(layerbranch, repodir, logger) config_data = layerconfparser.parse_layer(layerbranch, repodir) if not config_data: |