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.py: add -t option for layer_type

Browse Source 
Now the logic is:
Use options.layer_type if specified, and guess if not. Default to 'M'.

Note choices=['A', 'B', 'S', 'D', 'M', ''], the '' is for default='', we can't
use default='M' here, otherwise we don't know whether the 'M' is specified by
user or is the default value, we don't guess if it is specified by user,
otherwise, guess.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
This commit is contained in:
Robert Yang 2018-09-11 16:48:56 +08:00 committed by Paul Eggleton
parent ac32edb5bd
commit 3aa6bf964d
1 changed files with 32 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
layerindex/tools/import_layer.py
View File

@ -178,6 +178,22 @@ def get_github_layerinfo(layer_url, username = None, password = None):
return (json_data, owner_json_data) return (json_data, owner_json_data)
def get_layer_type_choices():
"""
Return help string and choices for --type.
"""
from layerindex.models import LayerItem
help_str = "Specify layer type."
choices = []
for i in LayerItem.LAYER_TYPE_CHOICES:
key, description = i
help_str += ' %s: %s,' % (key, description)
choices.append(key)
help_str = help_str.rstrip(',')
choices.append('')
return (help_str, choices)
def main(): def main():
valid_layer_name = re.compile('[-\w]+$') valid_layer_name = re.compile('[-\w]+$')
@ -186,9 +202,16 @@ def main():
usage = """ usage = """
%prog [options] <url> [name]""") %prog [options] <url> [name]""")
utils.setup_django()
layer_type_help, layer_type_choices = get_layer_type_choices()
parser.add_option("-s", "--subdir", parser.add_option("-s", "--subdir",
help = "Specify subdirectory", help = "Specify subdirectory",
action="store", dest="subdir") action="store", dest="subdir")
parser.add_option("-t", "--type",
help = layer_type_help,
choices = layer_type_choices,
action="store", dest="layer_type", default='')
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")
@ -238,7 +261,6 @@ def main():
github_login = None github_login = None
github_password = None github_password = None
utils.setup_django()
import settings import settings
from layerindex.models import LayerItem, LayerBranch, LayerDependency, LayerMaintainer from layerindex.models import LayerItem, LayerBranch, LayerDependency, LayerMaintainer
from django.db import transaction from django.db import transaction
@ -263,7 +285,6 @@ def main():
layer = LayerItem() layer = LayerItem()
layer.name = layer_name layer.name = layer_name
layer.status = 'P' layer.status = 'P'
layer.layer_type = 'M'
layer.summary = 'tempvalue' layer.summary = 'tempvalue'
layer.description = layer.summary layer.description = layer.summary
@ -349,11 +370,18 @@ def main():
logger.info('Creating layer %s' % layer.name) logger.info('Creating layer %s' % layer.name)
# Guess layer type # Guess layer type if not specified
if glob.glob(os.path.join(layerdir, 'conf/distro/*.conf')): if options.layer_type:
layer.layer_type = options.layer_type
elif layer.name in ['openembedded-core', 'meta-oe']:
layer.layer_type = 'A'
elif glob.glob(os.path.join(layerdir, 'conf/distro/*.conf')):
layer.layer_type = 'D' layer.layer_type = 'D'
elif glob.glob(os.path.join(layerdir, 'conf/machine/*.conf')): elif glob.glob(os.path.join(layerdir, 'conf/machine/*.conf')):
layer.layer_type = 'B' layer.layer_type = 'B'
else:
layer.layer_type = 'M'
layer.save() layer.save()
layerbranch = LayerBranch() layerbranch = LayerBranch()
layerbranch.layer = layer layerbranch.layer = layer
@ -411,11 +439,9 @@ def main():
if layer.name == 'openembedded-core': if layer.name == 'openembedded-core':
layer.summary = 'Core metadata' layer.summary = 'Core metadata'
layer.layer_type = 'A'
elif layer.name == 'meta-oe': elif layer.name == 'meta-oe':
layer.summary = 'Additional shared OE metadata' layer.summary = 'Additional shared OE metadata'
layer.description = layer.summary layer.description = layer.summary
layer.layer_type = 'A'
if maintainers: if maintainers:
maint_re = re.compile(r'^"?([^"@$<>]+)"? *<([^<> ]+)>[ -]*(.+)?$') maint_re = re.compile(r'^"?([^"@$<>]+)"? *<([^<> ]+)>[ -]*(.+)?$')