aboutsummaryrefslogtreecommitdiffstats
path: root/layerindex/update_layer.py
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2017-06-01 00:16:47 -0700
committerPaul Eggleton <paul.eggleton@linux.intel.com>2017-07-21 08:15:53 +0200
commitde4400674da95d7dea90819cf7b5bebe643e4c6f (patch)
tree27ccfb3738c601282a3fa011215a274a9ed09cf1 /layerindex/update_layer.py
parent3ae517091b610d138cf072aa1a390489cb044d20 (diff)
downloadopenembedded-core-contrib-de4400674da95d7dea90819cf7b5bebe643e4c6f.tar.gz
update_layer.py: remove --update-dependencies
It never works since it is in the middle of transaction.atomic() block, and update.py doesn't need it any more, so remove it. Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Diffstat (limited to 'layerindex/update_layer.py')
-rw-r--r--layerindex/update_layer.py27
1 files changed, 0 insertions, 27 deletions
diff --git a/layerindex/update_layer.py b/layerindex/update_layer.py
index 7b945e7d9f..1c33c783fb 100644
--- a/layerindex/update_layer.py
+++ b/layerindex/update_layer.py
@@ -182,9 +182,6 @@ def main():
parser.add_option("-n", "--dry-run",
help = "Don't write any data back to the database",
action="store_true", dest="dryrun")
- parser.add_option("", "--update-dependencies",
- help = "Update layer dependencies only",
- action="store_true", dest="updatedeps")
parser.add_option("", "--nocheckout",
help = "Don't check out branches",
action="store_true", dest="nocheckout")
@@ -256,30 +253,6 @@ def main():
branchname = layerbranch.actual_branch
branchdesc = "%s (%s)" % (options.branch, branchname)
- if options.updatedeps:
- # Update layer dependencies only
- if not layerbranch:
- logger.debug('Skipping dependency update for layer %s on branch %s - no layerbranch record' % (layer, branchdesc))
- sys.exit(0)
- if not options.nocheckout:
- utils.checkout_layer_branch(layerbranch, repodir, logger=logger)
- layerdir = os.path.join(repodir, layerbranch.vcs_subdir)
- if not os.path.exists(layerdir):
- # If this happens it was already flagged during the main update, so ignore it
- logger.debug('Skipping dependency update for layer %s on branch %s - layer directory not found' % (layer, branchdesc))
- sys.exit(0)
-
- layerconfparser = layerconfparse.LayerConfParse(logger=logger, bitbakepath=bitbakepath, tinfoil=tinfoil)
- config_data = layerconfparser.parse_layer(layerdir)
- if not config_data:
- logger.debug("Layer %s does not appear to be valid for branch %s" % (layer.name, branchdesc))
- sys.exit(0)
-
- utils.add_dependencies(layerbranch, config_data, logger=logger)
- utils.add_recommends(layerbranch, config_data, logger=logger)
-
- sys.exit(0)
-
# Collect repo info
repo = git.Repo(repodir)
assert repo.bare == False