mirror of
git://git.yoctoproject.org/layerindex-web.git
synced 2025-07-19 20:59:01 +02:00
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>
This commit is contained in:
parent
3ae517091b
commit
de4400674d
|
@ -182,9 +182,6 @@ def main():
|
||||||
parser.add_option("-n", "--dry-run",
|
parser.add_option("-n", "--dry-run",
|
||||||
help = "Don't write any data back to the database",
|
help = "Don't write any data back to the database",
|
||||||
action="store_true", dest="dryrun")
|
action="store_true", dest="dryrun")
|
||||||
parser.add_option("", "--update-dependencies",
|
|
||||||
help = "Update layer dependencies only",
|
|
||||||
action="store_true", dest="updatedeps")
|
|
||||||
parser.add_option("", "--nocheckout",
|
parser.add_option("", "--nocheckout",
|
||||||
help = "Don't check out branches",
|
help = "Don't check out branches",
|
||||||
action="store_true", dest="nocheckout")
|
action="store_true", dest="nocheckout")
|
||||||
|
@ -256,30 +253,6 @@ def main():
|
||||||
branchname = layerbranch.actual_branch
|
branchname = layerbranch.actual_branch
|
||||||
branchdesc = "%s (%s)" % (options.branch, branchname)
|
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
|
# Collect repo info
|
||||||
repo = git.Repo(repodir)
|
repo = git.Repo(repodir)
|
||||||
assert repo.bare == False
|
assert repo.bare == False
|
||||||
|
|
Loading…
Reference in New Issue
Block a user