diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2015-02-25 15:29:58 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-02-25 23:29:29 +0000 |
commit | efd78e35082ccf6164ae11f988378398d1295304 (patch) | |
tree | e5aeeb78f1a1de19aee90b38c11b94386e838693 | |
parent | 40d80f9e019118ac7bcd268f21e350bc154a4a63 (diff) | |
download | poky-efd78e35082ccf6164ae11f988378398d1295304.tar.gz |
bitbake: bitbake-layers: fix wildcard support in remove-layer
The recent refactoring caused use of wildcards to trigger a traceback
because the old variable name was being used.
Fixes [YOCTO #7367].
(Bitbake rev: 7182cdd3c4a534a87147bb0aad7b360ffef6426b)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-x | bitbake/bin/bitbake-layers | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bitbake/bin/bitbake-layers b/bitbake/bin/bitbake-layers index a86ad1c0f1..89662c7f91 100755 --- a/bitbake/bin/bitbake-layers +++ b/bitbake/bin/bitbake-layers | |||
@@ -119,7 +119,7 @@ Removes the specified layer from bblayers.conf | |||
119 | return 1 | 119 | return 1 |
120 | 120 | ||
121 | if args.layerdir.startswith('*'): | 121 | if args.layerdir.startswith('*'): |
122 | layerdir = dirname | 122 | layerdir = args.layerdir |
123 | else: | 123 | else: |
124 | layerdir = os.path.abspath(args.layerdir) | 124 | layerdir = os.path.abspath(args.layerdir) |
125 | (_, notremoved) = bb.utils.edit_bblayers_conf(bblayers_conf, None, layerdir) | 125 | (_, notremoved) = bb.utils.edit_bblayers_conf(bblayers_conf, None, layerdir) |