diff options
Diffstat (limited to 'bitbake/lib/bblayers')
-rw-r--r-- | bitbake/lib/bblayers/action.py | 4 | ||||
-rw-r--r-- | bitbake/lib/bblayers/layerindex.py | 1 | ||||
-rw-r--r-- | bitbake/lib/bblayers/query.py | 8 |
3 files changed, 7 insertions, 6 deletions
diff --git a/bitbake/lib/bblayers/action.py b/bitbake/lib/bblayers/action.py index d6459d6617..d2f9c1bbde 100644 --- a/bitbake/lib/bblayers/action.py +++ b/bitbake/lib/bblayers/action.py | |||
@@ -50,10 +50,10 @@ class ActionPlugin(LayerPlugin): | |||
50 | if not (args.force or notadded): | 50 | if not (args.force or notadded): |
51 | try: | 51 | try: |
52 | self.tinfoil.run_command('parseConfiguration') | 52 | self.tinfoil.run_command('parseConfiguration') |
53 | except bb.tinfoil.TinfoilUIException: | 53 | except (bb.tinfoil.TinfoilUIException, bb.BBHandledException): |
54 | # Restore the back up copy of bblayers.conf | 54 | # Restore the back up copy of bblayers.conf |
55 | shutil.copy2(backup, bblayers_conf) | 55 | shutil.copy2(backup, bblayers_conf) |
56 | bb.fatal("Parse failure with the specified layer added") | 56 | bb.fatal("Parse failure with the specified layer added, aborting.") |
57 | else: | 57 | else: |
58 | for item in notadded: | 58 | for item in notadded: |
59 | sys.stderr.write("Specified layer %s is already in BBLAYERS\n" % item) | 59 | sys.stderr.write("Specified layer %s is already in BBLAYERS\n" % item) |
diff --git a/bitbake/lib/bblayers/layerindex.py b/bitbake/lib/bblayers/layerindex.py index 95b67a6621..f64d18e819 100644 --- a/bitbake/lib/bblayers/layerindex.py +++ b/bitbake/lib/bblayers/layerindex.py | |||
@@ -206,6 +206,7 @@ class LayerIndexPlugin(ActionPlugin): | |||
206 | """ | 206 | """ |
207 | args.show_only = True | 207 | args.show_only = True |
208 | args.ignore = [] | 208 | args.ignore = [] |
209 | args.shallow = True | ||
209 | self.do_layerindex_fetch(args) | 210 | self.do_layerindex_fetch(args) |
210 | 211 | ||
211 | def register_commands(self, sp): | 212 | def register_commands(self, sp): |
diff --git a/bitbake/lib/bblayers/query.py b/bitbake/lib/bblayers/query.py index e2cc310532..652a3acce0 100644 --- a/bitbake/lib/bblayers/query.py +++ b/bitbake/lib/bblayers/query.py | |||
@@ -150,7 +150,7 @@ skipped recipes will also be listed, with a " (skipped)" suffix. | |||
150 | def print_item(f, pn, ver, layer, ispref): | 150 | def print_item(f, pn, ver, layer, ispref): |
151 | if not selected_layer or layer == selected_layer: | 151 | if not selected_layer or layer == selected_layer: |
152 | if not bare and f in skiplist: | 152 | if not bare and f in skiplist: |
153 | skipped = ' (skipped)' | 153 | skipped = ' (skipped: %s)' % self.tinfoil.cooker.skiplist[f].skipreason |
154 | else: | 154 | else: |
155 | skipped = '' | 155 | skipped = '' |
156 | if show_filenames: | 156 | if show_filenames: |
@@ -433,10 +433,10 @@ NOTE: .bbappend files can impact the dependencies. | |||
433 | line = fnfile.readline() | 433 | line = fnfile.readline() |
434 | 434 | ||
435 | # The "require/include xxx" in conf/machine/*.conf, .inc and .bbclass | 435 | # The "require/include xxx" in conf/machine/*.conf, .inc and .bbclass |
436 | conf_re = re.compile(".*/conf/machine/[^\/]*\.conf$") | 436 | conf_re = re.compile(r".*/conf/machine/[^\/]*\.conf$") |
437 | inc_re = re.compile(".*\.inc$") | 437 | inc_re = re.compile(r".*\.inc$") |
438 | # The "inherit xxx" in .bbclass | 438 | # The "inherit xxx" in .bbclass |
439 | bbclass_re = re.compile(".*\.bbclass$") | 439 | bbclass_re = re.compile(r".*\.bbclass$") |
440 | for layerdir in self.bblayers: | 440 | for layerdir in self.bblayers: |
441 | layername = self.get_layer_name(layerdir) | 441 | layername = self.get_layer_name(layerdir) |
442 | for dirpath, dirnames, filenames in os.walk(layerdir): | 442 | for dirpath, dirnames, filenames in os.walk(layerdir): |