MIRRORS/layerindex-web
1
0
Fork 0
mirror of git://git.yoctoproject.org/layerindex-web.git synced 2025-07-19 20:59:01 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

import_layer: Add --actual-branch option

Browse Source 
Allow users to set actual-branch from the command line import of layers.

Signed-off-by: Liam R. Howlett <Liam.Howlett@WindRiver.com>
This commit is contained in:
Liam R. Howlett 2016-08-25 12:34:30 -04:00 committed by Paul Eggleton
parent 1e2ebe95da
commit aaddb1c9a5
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
layerindex/tools/import_layer.py
View File

@ -200,6 +200,9 @@ def main():
parser.add_option("-q", "--quiet", parser.add_option("-q", "--quiet",
help = "Hide all output except error messages", help = "Hide all output except error messages",
action="store_const", const=logging.ERROR, dest="loglevel") action="store_const", const=logging.ERROR, dest="loglevel")
parser.add_option("-a", "--actual-branch",
help = "Set actual branch",
action="store", dest="actual_branch")
options, args = parser.parse_args(sys.argv) options, args = parser.parse_args(sys.argv)
@ -273,10 +276,13 @@ def main():
logger.error("Fetch failed: %s" % str(e)) logger.error("Fetch failed: %s" % str(e))
sys.exit(1) sys.exit(1)
actual_branch = '' actual_branch = 'master'
if (options.actual_branch):
actual_branch = options.actual_branch
try: try:
out = utils.runcmd("git checkout origin/master", repodir, logger=logger) out = utils.runcmd("git checkout origin/%s" % actual_branch, repodir, logger=logger)
except subprocess.CalledProcessError: except subprocess.CalledProcessError:
actual_branch = None
branches = utils.runcmd("git branch -r", repodir, logger=logger) branches = utils.runcmd("git branch -r", repodir, logger=logger)
for line in branches.splitlines(): for line in branches.splitlines():
if 'origin/HEAD ->' in line: if 'origin/HEAD ->' in line: