diff options
| author |   Joshua Watt <JPEWhacker@gmail.com> | 2020-06-05 22:15:36 -0500 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-06-08 21:33:27 +0100 |
| commit | 325827af66434affc2da460cc8b9a5c460e38056 (patch) | |
| tree | a9f23578c0a1207c0c0282129f376250c92003c1 /lib | |
| parent | 513fc2dddf13d5e344162c26d89d2dde2fe85634 (diff) | |
| download | bitbake-325827af66434affc2da460cc8b9a5c460e38056.tar.gz | |
bitbake: command: Move split_mc_pn to runqueue
All of the other multiconfig splitting functions are located in runqueue
so move the function to split a pn/fn there also so that its easier to
see them all together. Fixes a case where the findBestProvider() command
wasn't working for multiconfig because it was looking for a prefix of
"multiconfig:" instead of the newer "mc:"
Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/bb/command.py | 8 | ||||
| -rw-r--r-- | lib/bb/runqueue.py | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/lib/bb/command.py b/lib/bb/command.py index d11907e3b..3902ccca7 100644 --- a/lib/bb/command.py +++ b/lib/bb/command.py @@ -138,12 +138,6 @@ class Command: def reset(self): self.remotedatastores = bb.remotedata.RemoteDatastores(self.cooker) -def split_mc_pn(pn): - if pn.startswith("multiconfig:"): - _, mc, pn = pn.split(":", 2) - return (mc, pn) - return ('', pn) - class CommandsSync: """ A class of synchronous commands @@ -442,7 +436,7 @@ class CommandsSync: findProviders.readonly = True def findBestProvider(self, command, params): - (mc, pn) = split_mc_pn(params[0]) + (mc, pn) = bb.runqueue.split_mc(params[0]) return command.cooker.findBestProvider(pn, mc) findBestProvider.readonly = True diff --git a/lib/bb/runqueue.py b/lib/bb/runqueue.py index 3d54c2b88..5b7dab8d7 100644 --- a/lib/bb/runqueue.py +++ b/lib/bb/runqueue.py @@ -46,6 +46,12 @@ def split_tid(tid): (mc, fn, taskname, _) = split_tid_mcfn(tid) return (mc, fn, taskname) +def split_mc(n): + if n.startswith("mc:"): + _, mc, n = n.split(":", 2) + return (mc, n) + return ('', n) + def split_tid_mcfn(tid): if tid.startswith('mc:'): elems = tid.split(':') |