import_layer.py: add -t option for layer_type
cover import_layer.py: add -t option for layer_type
The following changes since commit 65d058237f96a151c913a70ba4d639c7aa0fb0b5:
Dockerfile: Reduce image size by merging RUN stages together (2018-07-23 08:40:00 +0200)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib rbt/li
http://git.pokylinux.org/cgit.cgi//log/?h=rbt/li
Robert Yang (1):
import_layer.py: add -t option for layer_type
layerindex/tools/import_layer.py | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-)
Signature · 1 line
2.7.4
PATCH 1/1 import_layer.py: add -t option for layer_type
Now the logic is:
Use options.layer_type if specified, 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 not, we don't guess if it is specified by user, otherwise, guess.
--- layerindex/tools/import_layer.py | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-)
layerindex/tools/import_layer.py +13 -5
@@ -189,6 +189,10 @@ def main(): parser.add_option("-s", "--subdir", help = "Specify subdirectory", action="store", dest="subdir") + parser.add_option("-t", "--type", + help = "Specify layer type. A: Base, B: Machine(BSP), S: Software, D: Distribution, M: Miscellaneous", + choices=['A', 'B', 'S', 'D', 'M', ''], + action="store", dest="layer_type", default='') parser.add_option("-n", "--dry-run", help = "Don't write any data back to the database", action="store_true", dest="dryrun")
@@ -263,7 +267,6 @@ def main(): layer = LayerItem() layer.name = layer_name layer.status = 'P' - layer.layer_type = 'M' layer.summary = 'tempvalue' layer.description = layer.summary
@@ -349,11 +352,18 @@ def main(): logger.info('Creating layer %s' % layer.name) - # Guess layer type - if glob.glob(os.path.join(layerdir, 'conf/distro/*.conf')): + # Guess layer type if not specified + 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' elif glob.glob(os.path.join(layerdir, 'conf/machine/*.conf')): layer.layer_type = 'B' + else: + layer.layer_type = 'M' + layer.save() layerbranch = LayerBranch() layerbranch.layer = layer
@@ -411,11 +421,9 @@ def main(): if layer.name == 'openembedded-core': layer.summary = 'Core metadata' - layer.layer_type = 'A' elif layer.name == 'meta-oe': layer.summary = 'Additional shared OE metadata' layer.description = layer.summary - layer.layer_type = 'A' if maintainers: maint_re = re.compile(r'^"?([^"@$<>]+)"? *<([^<> ]+)>[ -]*(.+)?$')
Signature · 1 line
2.7.4
Hi Robert,
Quoted 17 lines · CEST Robert Yang
Now the logic is:
Use options.layer_type if specified, 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 not, we don't guess if it is specified by user, otherwise, guess.
Signed-off-by Robert Yang <[email protected]>--- layerindex/tools/import_layer.py | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-)layerindex/tools/import_layer.py +0
-0
layerindex/tools/import_layer.py def main(): · line 195
Quoted 7 lines
layerindex/tools/import_layer.py +4
-0@@ -189,6 +189,10 @@ def main(): parser.add_option("-s", "--subdir", help = "Specify subdirectory", action="store", dest="subdir") + parser.add_option("-t", "--type", + help = "Specify layer type. A: Base, B: Machine(BSP), S: Software, D: Distribution, M: Miscellaneous", + choices=['A', 'B', 'S', 'D', 'M', ''], + action="store", dest="layer_type", default='')
If it's practical to do, could you make this part of the code use LayerItem.LAYER_TYPE_CHOICES from models.py so that this will work if that is extended in future? Of course that will mean initialising Django earlier, I'm not sure if that will have any side-effects that we wouldn't want. If you could give that a try though that would be great.
Thanks,
Paul
Signature · 2 lines
Paul Eggleton Intel Open Source Technology Centre
Hi Paul,
Quoted 25 lines · Paul Eggleton
Hi Robert,
Quoted 22 lines · CEST Robert Yang
Now the logic is:
Use options.layer_type if specified, 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 not, we don't guess if it is specified by user, otherwise, guess.
Signed-off-by Robert Yang <[email protected]>--- layerindex/tools/import_layer.py | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-)layerindex/tools/import_layer.py +2
-0@@ -189,6 +189,10 @@ def main(): parser.add_option("-s", "--subdir", help = "Specify subdirectory", action="store", dest="subdir") + parser.add_option("-t", "--type", + help = "Specify layer type. A: Base, B: Machine(BSP), S: Software, D: Distribution, M: Miscellaneous",
Quoted 8 lines
layerindex/tools/import_layer.py def main(): · line 195
Quoted 2 lines
layerindex/tools/import_layer.py +2
-0+ choices=['A', 'B', 'S', 'D', 'M', ''], + action="store", dest="layer_type", default='')If it's practical to do, could you make this part of the code use LayerItem.LAYER_TYPE_CHOICES from
models.pyso that this will work if that is extended in future? Of course that will mean initialising Django earlier, I'm not sure if that will have any side-effects that we wouldn't want. If you could give that a try though that would be great.
I think that the easies way is move the definition of LAYER_TYPE_CHOICES to utils.py, then we can use utils.LAYER_TYPE_CHOICES in both models.py and tools/import_layer.py
I've updated it in the repo:
git://git.pokylinux.org/poky-contrib rbt/li
http://git.pokylinux.org/cgit.cgi//log/?h=rbt/li
commit aeb1fd6a8f10b40637121643fc7df2f17c9cd87c
Author: Robert Yang <[email protected]> Date: Mon Jul 9 15:28:10 2018 +0800
import_layer.py: add -t option for layer_type
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.
layerindex/models.py +2 -8
@@ -102,14 +102,8 @@ class LayerItem(models.Model): ('P', 'Published'), ('X', 'No update'), ) - LAYER_TYPE_CHOICES = ( - ('A', 'Base'), - ('B', 'Machine (BSP)'), - ('S', 'Software'), - ('D', 'Distribution'), - ('W', 'WRTemplates'), - ('M', 'Miscellaneous'), - ) + LAYER_TYPE_CHOICES = utils.LAYER_TYPE_CHOICES + name = models.CharField('Layer name', max_length=40, unique=True,
help_text='Name of the layer - must be unique and can only contain letters, numbers and dashes')
status = models.CharField(max_length=1, choices=LAYER_STATUS_CHOICES,
default='N')
layer_type = models.CharField(max_length=1, choices=LAYER_TYPE_CHOICES)
layerindex/tools/import_layer.py +30 -5
@@ -178,6 +178,21 @@ def get_github_layerinfo(layer_url, username = None, password = None): return (json_data, owner_json_data) +def get_layer_type_choices(): + """ + Return help string and choices for --type. + """ + help_str = "Specify layer type." + choices = [] + for i in utils.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(): valid_layer_name = re.compile('[-\w]+$')
@@ -186,9 +201,15 @@ def main(): usage = """ %prog [options] <url> [name]""") + layer_type_help, layer_type_choices = get_layer_type_choices() + parser.add_option("-s", "--subdir", help = "Specify subdirectory", 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", help = "Don't write any data back to the database", action="store_true", dest="dryrun")
@@ -263,7 +284,6 @@ def main(): layer = LayerItem() layer.name = layer_name layer.status = 'P' - layer.layer_type = 'M' layer.summary = 'tempvalue' layer.description = layer.summary
@@ -349,11 +369,18 @@ def main(): logger.info('Creating layer %s' % layer.name) - # Guess layer type - if glob.glob(os.path.join(layerdir, 'conf/distro/*.conf')): + # Guess layer type if not specified + 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' elif glob.glob(os.path.join(layerdir, 'conf/machine/*.conf')): layer.layer_type = 'B' + else: + layer.layer_type = 'M' + layer.save() layerbranch = LayerBranch() layerbranch.layer = layer
@@ -411,11 +438,9 @@ def main(): if layer.name == 'openembedded-core': layer.summary = 'Core metadata' - layer.layer_type = 'A' elif layer.name == 'meta-oe': layer.summary = 'Additional shared OE metadata' layer.description = layer.summary - layer.layer_type = 'A' if maintainers: maint_re = re.compile(r'^"?([^"@$<>]+)"? *<([^<> ]+)>[
-]*(.+)?$')
layerindex/utils.py +9 -0
@@ -15,6 +15,15 @@ import fcntl import signal import codecs +LAYER_TYPE_CHOICES = ( + ('A', 'Base'), + ('B', 'Machine (BSP)'), + ('S', 'Software'), + ('D', 'Distribution'), + ('W', 'WRTemplates'), + ('M', 'Miscellaneous'), +) + def get_branch(branchname): from layerindex.models import Branch res = list(Branch.objects.filter(name=branchname)[:1])
// Robert
Quoted 4 lines
Thanks,
Paul
Hi Paul,
Do you have any comments on this, please ?
// Robert
Quoted 197 lines · Robert Yang
Hi Paul,
Quoted 26 lines · Paul Eggleton
Hi Robert,
Quoted 23 lines · CEST Robert Yang
Now the logic is:
Use options.layer_type if specified, 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 not, we don't guess if it is specified by user, otherwise, guess.
Signed-off-by Robert Yang <[email protected]>---
layerindex/tools/import_layer.py| 18 +++++++++++++-----1 file changed, 13 insertions(+), 5 deletions(-)layerindex/tools/import_layer.py +2
-0@@ -189,6 +189,10 @@ def main(): parser.add_option("-s", "--subdir", help = "Specify subdirectory", action="store", dest="subdir") + parser.add_option("-t", "--type", + help = "Specify layer type. A: Base, B: Machine(BSP), S: Software, D: Distribution, M: Miscellaneous",Quoted 8 lines
layerindex/tools/import_layer.py def main(): · line 196
Quoted 2 lines
layerindex/tools/import_layer.py +2
-0+ choices=['A', 'B', 'S', 'D', 'M', ''], + action="store", dest="layer_type", default='')If it's practical to do, could you make this part of the code use LayerItem.LAYER_TYPE_CHOICES from
models.pyso that this will work if that is extended in future? Of course that will mean initialising Django earlier, I'm not sure if that will have any side-effects that we wouldn't want. If you could give that a try though that would be great.I think that the easies way is move the definition of
LAYER_TYPE_CHOICEStoutils.py, then we can use utils.LAYER_TYPE_CHOICES in bothmodels.pyandtools/import_layer.pyI've updated it in the repo:
git://git.pokylinux.org/poky-contribrbt/li
http://git.pokylinux.org/cgit.cgi//log/?h=rbt/licommit
aeb1fd6a8f10b40637121643fc7df2f17c9cd87c
Author: Robert Yang <[email protected]>
Date: Mon Jul 9 15:28:10 2018 +0800
import_layer.py: add -t option forlayer_typeNow 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 <[email protected]>layerindex/models.py +2
-8@@ -102,14 +102,8 @@ class LayerItem(models.Model): ('P', 'Published'), ('X', 'No update'), ) - LAYER_TYPE_CHOICES = ( - ('A', 'Base'), - ('B', 'Machine (BSP)'), - ('S', 'Software'), - ('D', 'Distribution'), - ('W', 'WRTemplates'), - ('M', 'Miscellaneous'), - ) + LAYER_TYPE_CHOICES = utils.LAYER_TYPE_CHOICES + name = models.CharField('Layer name', max_length=40, unique=True, help_text='Name of the layer - must be unique and can only contain letters, numbers and dashes') status = models.CharField(max_length=1, choices=LAYER_STATUS_CHOICES,default='N')
layer_type=models.CharField(max_length=1, choices=LAYER_TYPE_CHOICES)layerindex/tools/import_layer.py +0
-0@@ -178,6 +178,21 @@ def get_github_layerinfo(layer_url, username = None,password = None):
return (
json_data,owner_json_data)layerindex/tools/import_layer.py +30
-6+def get_layer_type_choices(): + """ + Return help string and choices for --type. + """ + help_str = "Specify layer type." + choices = [] + for i in utils.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(): valid_layer_name = re.compile('[-\w]+$')@@ -186,9 +201,15 @@ def main(): usage = """ %prog [options] <url> [name]""") + layer_type_help, layer_type_choices = get_layer_type_choices() + parser.add_option("-s", "--subdir", help = "Specify subdirectory", 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", help = "Don't write any data back to the database", action="store_true", dest="dryrun")@@ -263,7 +284,6 @@ def main(): layer = LayerItem() layer.name = layer_name layer.status = 'P' - layer.layer_type = 'M' layer.summary = 'tempvalue' layer.description = layer.summary@@ -349,11 +369,18 @@ def main(): logger.info('Creating layer %s' % layer.name) - # Guess layer type - if glob.glob(os.path.join(layerdir, 'conf/distro/*.conf')): + # Guess layer type if not specified + 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' elif glob.glob(os.path.join(layerdir, 'conf/machine/*.conf')): layer.layer_type = 'B' + else: + layer.layer_type = 'M' + layer.save() layerbranch = LayerBranch() layerbranch.layer = layer@@ -411,11 +438,9 @@ def main(): if layer.name == 'openembedded-core': layer.summary = 'Core metadata' - layer.layer_type = 'A' elif layer.name == 'meta-oe': layer.summary = 'Additional shared OE metadata' layer.description = layer.summary - layer.layer_type = 'A' if maintainers: maint_re = re.compile(r'^"?([^"@$<>]+)"? *<([^<> ]+)>[ -]*(.+)?$')layerindex/utils.py +9
-0@@ -15,6 +15,15 @@ import fcntl import signal import codecs +LAYER_TYPE_CHOICES = ( + ('A', 'Base'), + ('B', 'Machine (BSP)'), + ('S', 'Software'), + ('D', 'Distribution'), + ('W', 'WRTemplates'), + ('M', 'Miscellaneous'), +) + def get_branch(branchname): from layerindex.models import Branch res = list(Branch.objects.filter(name=branchname)[:1])// Robert
Quoted 4 lines
Thanks,
Paul
Hi Robert
Sorry I meant to reply earlier.
I'm not especially happy with moving the constants to utils.py. Is there any way we can avoid that?
Thanks
Paul
Quoted 17 lines · NZST Robert Yang
Hi Paul,
Do you have any comments on this, please ?
// Robert
Quoted 10 lines · Robert Yang
Hi Paul,
Quoted 7 lines · Paul Eggleton
Hi Robert,
Quoted 4 lines · CEST Robert Yang
Now the logic is:
Use options.layer_type if specified, guess if not, default to 'M'.Note choices=['A', 'B', 'S', 'D', 'M', ''], the '' is for default='', we
can't
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
use default='M' here, otherwise we don't know whether the 'M' is
specified by
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
user or not, we don't guess if it is specified by user, otherwise,
guess.
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
layerindex/tools/
Quoted 7 lines
Signed-off-by Robert Yang <[email protected]>--- layerindex/tools/import_layer.py | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-)layerindex/tools/ renamed from layerindex/tools/import_layer.py +0
-0
import_layer.py
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
index 2413cff..0d501f6 100755
layerindex/tools/import_layer.py +1
-0@@ -189,6 +189,10 @@ def main(): parser.add_option("-s", "--subdir", help = "Specify subdirectory", action="store", dest="subdir") + parser.add_option("-t", "--type",
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
layerindex/tools/import_layer.py def main(): · line 196
Quoted 4 lines
layerindex/tools/import_layer.py +3
-0+ help = "Specify layer type. A: Base, B: Machine(BSP), S: Software, D: Distribution, M: Miscellaneous", + choices=['A', 'B', 'S', 'D', 'M', ''], + action="store", dest="layer_type", default='')If it's practical to do, could you make this part of the code use LayerItem.LAYER_TYPE_CHOICES from
models.pyso that this will work if that is extended in future? Of course that will mean initialising
Django
Quoted 1 line
Quoted 1 line
Quoted 1 line
earlier, I'm not sure if that will have any side-effects that we wouldn't
want.
Quoted 11 lines
Quoted 11 lines
Quoted 1 line
If you could give that a try though that would be great.
I think that the easies way is move the definition of
LAYER_TYPE_CHOICEStoutils.py, then we can use utils.LAYER_TYPE_CHOICES in bothmodels.pyandtools/import_layer.pyI've updated it in the repo:
git://git.pokylinux.org/poky-contrib rbt/li http://git.pokylinux.org/cgit.cgi//log/?h=rbt/li
Quoted 8 lines
Quoted 8 lines
commit
aeb1fd6a8f10b40637121643fc7df2f17c9cd87cAuthor: Robert Yang <[email protected]> Date: Mon Jul 9 15:28:10 2018 +0800
import_layer.py: add -t option forlayer_typeNow the logic is:
Use options.layer_type if specified, and guess if not. Default to
'M'.
Quoted 2 lines
Quoted 2 lines
Note choices=['A', 'B', 'S', 'D', 'M', ''], the '' is for default='',
we can't
Quoted 1 line
Quoted 1 line
use default='M' here, otherwise we don't know whether the 'M' is
specified by
Quoted 1 line
Quoted 1 line
user or is the default value, we don't guess if it is specified by
user,
Quoted 16 lines
Quoted 16 lines
otherwise, guess.
Signed-off-by Robert Yang <[email protected]>layerindex/models.py +0
-4@@ -102,14 +102,8 @@ class LayerItem(models.Model): ('P', 'Published'), ('X', 'No update'), ) - LAYER_TYPE_CHOICES = ( - ('A', 'Base'), - ('B', 'Machine (BSP)'), - ('S', 'Software'),
Quoted 8 lines
Quoted 8 lines
layerindex/models.py +2
-4- ('D', 'Distribution'), - ('W', 'WRTemplates'), - ('M', 'Miscellaneous'), - ) + LAYER_TYPE_CHOICES = utils.LAYER_TYPE_CHOICES + name = models.CharField('Layer name', max_length=40, unique=True,help_text='Name of the layer - must be unique and can only contain
letters,
Quoted 2 lines
Quoted 2 lines
numbers and dashes')
status = models.CharField(max_length=1,
choices=LAYER_STATUS_CHOICES,
Quoted 2 lines
Quoted 2 lines
default='N')
layer_type= models.CharField(max_length=1,
choices=LAYER_TYPE_CHOICES)
Quoted 1 line
layerindex/tools/
Quoted 1 line
layerindex/tools/ renamed from layerindex/tools/import_layer.py +0
-0
import_layer.py
Quoted 50 lines
Quoted 50 lines
index 2413cff..5373cce 100755
layerindex/tools/import_layer.py +0
-0@@ -178,6 +178,21 @@ def get_github_layerinfo(layer_url, username = None,password = None):
return (
json_data,owner_json_data)layerindex/tools/import_layer.py +21
-1+def get_layer_type_choices(): + """ + Return help string and choices for --type. + """ + help_str = "Specify layer type." + choices = [] + for i in utils.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(): valid_layer_name = re.compile('[-\w]+$')@@ -186,9 +201,15 @@ def main(): usage = """ %prog [options] <url> [name]""") + layer_type_help, layer_type_choices = get_layer_type_choices() + parser.add_option("-s", "--subdir", help = "Specify subdirectory", 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", help = "Don't write any data back to the database", action="store_true", dest="dryrun")@@ -263,7 +284,6 @@ def main(): layer = LayerItem() layer.name = layer_name layer.status = 'P' - layer.layer_type = 'M' layer.summary = 'tempvalue' layer.description = layer.summary
Quoted 6 lines
layerindex/tools/import_layer.py def main(): · line 353
Quoted 6 lines
layerindex/tools/import_layer.py +0
-2@@ -349,11 +369,18 @@ def main(): logger.info('Creating layer %s' % layer.name) - # Guess layer type - if glob.glob(os.path.join(layerdir, 'conf/distro/
*.conf')):
Quoted 6 lines
layerindex/tools/import_layer.py def main():
Quoted 6 lines
layerindex/tools/import_layer.py +6
-0+ # Guess layer type if not specified + 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')):
Quoted 2 lines
layerindex/tools/import_layer.py def main(): · line 379
Quoted 2 lines
layerindex/tools/import_layer.py +0
-0layer.layer_type = 'D' elif glob.glob(os.path.join(layerdir, 'conf/machine/
*.conf')):
Quoted 17 lines
Quoted 17 lines
layerindex/tools/import_layer.py +3
-2layer.layer_type = 'B' + else: + layer.layer_type = 'M' + layer.save() layerbranch = LayerBranch() layerbranch.layer = layer@@ -411,11 +438,9 @@ def main(): if layer.name == 'openembedded-core': layer.summary = 'Core metadata' - layer.layer_type = 'A' elif layer.name == 'meta-oe': layer.summary = 'Additional shared OE metadata' layer.description = layer.summary - layer.layer_type = 'A'
Quoted 2 lines
layerindex/tools/import_layer.py def main(): · line 446
Quoted 2 lines
layerindex/tools/import_layer.py +0
-0if maintainers: maint_re = re.compile(r'^"?([^"@$<>]+)"? *<([^<> ]
+)>[
Quoted 28 lines
Quoted 27 lines
-]*(.+)?$')
layerindex/utils.py +9
-0@@ -15,6 +15,15 @@ import fcntl import signal import codecs +LAYER_TYPE_CHOICES = ( + ('A', 'Base'), + ('B', 'Machine (BSP)'), + ('S', 'Software'), + ('D', 'Distribution'), + ('W', 'WRTemplates'), + ('M', 'Miscellaneous'), +) + def get_branch(branchname): from layerindex.models import Branch res = list(Branch.objects.filter(name=branchname)[:1])// Robert
Quoted 4 lines
Thanks,
Paul
Signature · 2 lines
Paul Eggleton Intel Open Source Technology Centre
Quoted 6 lines · Paul Eggleton
Hi Robert
Sorry I meant to reply earlier.
I'm not especially happy with moving the constants to
utils.py. Is there any way we can avoid that?
I will try to import models.py, but that may make things complicated.
// Robert
Quoted 231 lines
Thanks
PaulQuoted 17 lines · NZST Robert Yang
Hi Paul,
Do you have any comments on this, please ?
// Robert
Quoted 10 lines · Robert Yang
Hi Paul,
Quoted 7 lines · Paul Eggleton
Hi Robert,
Quoted 4 lines · CEST Robert Yang
Now the logic is:
Use options.layer_type if specified, guess if not, default to 'M'.Note choices=['A', 'B', 'S', 'D', 'M', ''], the '' is for default='', we
can't
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
use default='M' here, otherwise we don't know whether the 'M' is
specified by
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
user or not, we don't guess if it is specified by user, otherwise,
guess.
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
layerindex/tools/
Quoted 7 lines
Signed-off-by Robert Yang <[email protected]>--- layerindex/tools/import_layer.py | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-)layerindex/tools/ renamed from layerindex/tools/import_layer.py +0
-0
import_layer.pyQuoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
index 2413cff..0d501f6 100755
layerindex/tools/import_layer.py +1
-0@@ -189,6 +189,10 @@ def main(): parser.add_option("-s", "--subdir", help = "Specify subdirectory", action="store", dest="subdir") + parser.add_option("-t", "--type",Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
layerindex/tools/import_layer.py def main(): · line 196
Quoted 4 lines
layerindex/tools/import_layer.py +3
-0+ help = "Specify layer type. A: Base, B: Machine(BSP), S: Software, D: Distribution, M: Miscellaneous", + choices=['A', 'B', 'S', 'D', 'M', ''], + action="store", dest="layer_type", default='')If it's practical to do, could you make this part of the code use LayerItem.LAYER_TYPE_CHOICES from
models.pyso that this will work if that is extended in future? Of course that will mean initialisingDjango
Quoted 1 line
Quoted 1 line
Quoted 1 line
earlier, I'm not sure if that will have any side-effects that we wouldn't
want.
Quoted 11 lines
Quoted 11 lines
Quoted 1 line
If you could give that a try though that would be great.
I think that the easies way is move the definition of
LAYER_TYPE_CHOICEStoutils.py, then we can use utils.LAYER_TYPE_CHOICES in bothmodels.pyandtools/import_layer.pyI've updated it in the repo:
git://git.pokylinux.org/poky-contrib rbt/li http://git.pokylinux.org/cgit.cgi//log/?h=rbt/liQuoted 8 lines
Quoted 8 lines
commit
aeb1fd6a8f10b40637121643fc7df2f17c9cd87cAuthor: Robert Yang <[email protected]> Date: Mon Jul 9 15:28:10 2018 +0800
import_layer.py: add -t option forlayer_typeNow the logic is:
Use options.layer_type if specified, and guess if not. Default to'M'.
Quoted 2 lines
Quoted 2 lines
Note choices=['A', 'B', 'S', 'D', 'M', ''], the '' is for default='',we can't
Quoted 1 line
Quoted 1 line
use default='M' here, otherwise we don't know whether the 'M' is
specified by
Quoted 1 line
Quoted 1 line
user or is the default value, we don't guess if it is specified by
user,
Quoted 16 lines
Quoted 16 lines
otherwise, guess.
Signed-off-by Robert Yang <[email protected]>layerindex/models.py +0
-4@@ -102,14 +102,8 @@ class LayerItem(models.Model): ('P', 'Published'), ('X', 'No update'), ) - LAYER_TYPE_CHOICES = ( - ('A', 'Base'), - ('B', 'Machine (BSP)'), - ('S', 'Software'),Quoted 8 lines
Quoted 8 lines
layerindex/models.py +2
-4- ('D', 'Distribution'), - ('W', 'WRTemplates'), - ('M', 'Miscellaneous'), - ) + LAYER_TYPE_CHOICES = utils.LAYER_TYPE_CHOICES + name = models.CharField('Layer name', max_length=40, unique=True,help_text='Name of the layer - must be unique and can only contain
letters,
Quoted 2 lines
Quoted 2 lines
numbers and dashes')
status = models.CharField(max_length=1,choices=LAYER_STATUS_CHOICES,
Quoted 2 lines
Quoted 2 lines
default='N')
layer_type= models.CharField(max_length=1,choices=LAYER_TYPE_CHOICES)
Quoted 1 line
layerindex/tools/
Quoted 1 line
layerindex/tools/ renamed from layerindex/tools/import_layer.py +0
-0
import_layer.pyQuoted 50 lines
Quoted 50 lines
index 2413cff..5373cce 100755
layerindex/tools/import_layer.py +0
-0@@ -178,6 +178,21 @@ def get_github_layerinfo(layer_url, username = None,password = None):
return (
json_data,owner_json_data)layerindex/tools/import_layer.py +21
-1+def get_layer_type_choices(): + """ + Return help string and choices for --type. + """ + help_str = "Specify layer type." + choices = [] + for i in utils.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(): valid_layer_name = re.compile('[-\w]+$')@@ -186,9 +201,15 @@ def main(): usage = """ %prog [options] <url> [name]""") + layer_type_help, layer_type_choices = get_layer_type_choices() + parser.add_option("-s", "--subdir", help = "Specify subdirectory", 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", help = "Don't write any data back to the database", action="store_true", dest="dryrun")@@ -263,7 +284,6 @@ def main(): layer = LayerItem() layer.name = layer_name layer.status = 'P' - layer.layer_type = 'M' layer.summary = 'tempvalue' layer.description = layer.summaryQuoted 6 lines
layerindex/tools/import_layer.py def main(): · line 353
Quoted 6 lines
layerindex/tools/import_layer.py +0
-2@@ -349,11 +369,18 @@ def main(): logger.info('Creating layer %s' % layer.name) - # Guess layer type - if glob.glob(os.path.join(layerdir, 'conf/distro/*.conf')):
Quoted 6 lines
layerindex/tools/import_layer.py def main():
Quoted 6 lines
layerindex/tools/import_layer.py +6
-0+ # Guess layer type if not specified + 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')):
Quoted 2 lines
layerindex/tools/import_layer.py def main(): · line 379
Quoted 2 lines
layerindex/tools/import_layer.py +0
-0layer.layer_type = 'D' elif glob.glob(os.path.join(layerdir, 'conf/machine/*.conf')):
Quoted 17 lines
Quoted 17 lines
layerindex/tools/import_layer.py +3
-2layer.layer_type = 'B' + else: + layer.layer_type = 'M' + layer.save() layerbranch = LayerBranch() layerbranch.layer = layer@@ -411,11 +438,9 @@ def main(): if layer.name == 'openembedded-core': layer.summary = 'Core metadata' - layer.layer_type = 'A' elif layer.name == 'meta-oe': layer.summary = 'Additional shared OE metadata' layer.description = layer.summary - layer.layer_type = 'A'Quoted 2 lines
layerindex/tools/import_layer.py def main(): · line 446
Quoted 2 lines
layerindex/tools/import_layer.py +0
-0if maintainers: maint_re = re.compile(r'^"?([^"@$<>]+)"? *<([^<> ]+)>[
Quoted 28 lines
Quoted 27 lines
-]*(.+)?$')
layerindex/utils.py +9
-0@@ -15,6 +15,15 @@ import fcntl import signal import codecs +LAYER_TYPE_CHOICES = ( + ('A', 'Base'), + ('B', 'Machine (BSP)'), + ('S', 'Software'), + ('D', 'Distribution'), + ('W', 'WRTemplates'), + ('M', 'Miscellaneous'), +) + def get_branch(branchname): from layerindex.models import Branch res = list(Branch.objects.filter(name=branchname)[:1])// Robert
Quoted 4 lines
Thanks,
Paul