The current code for multiple argument passing is horrible. Tweak the
multiprocess_launch function to only convert to a tuple if it isn't already
one, which means we can then use function arguments in a standard way.
Signed-off-by: Richard Purdie <richard.pur...@linuxfoundation.org>
---
meta/lib/oe/package.py | 11 ++---------
meta/lib/oe/utils.py | 4 +++-
2 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/meta/lib/oe/package.py b/meta/lib/oe/package.py
index 1af10b7eb0e..0db14f21642 100644
--- a/meta/lib/oe/package.py
+++ b/meta/lib/oe/package.py
@@ -18,7 +18,7 @@ import shutil
import oe.cachedpath
-def runstrip(arg):
+def runstrip(file, elftype, strip, extra_strip_sections=''):
# Function to strip a single file, called from split_and_strip_files below
# A working 'file' (one which works on the target architecture)
#
@@ -28,12 +28,6 @@ def runstrip(arg):
# 8 - shared library
# 16 - kernel module
- if len(arg) == 3:
- (file, elftype, strip) = arg
- extra_strip_sections = ''
- else:
- (file, elftype, strip, extra_strip_sections) = arg
-
newmode = None
if not os.access(file, os.W_OK) or os.access(file, os.R_OK):
origmode = os.stat(file)[stat.ST_MODE]
@@ -220,10 +214,9 @@ def file_reverse_translate(file):
return ft
-def filedeprunner(arg):
+def filedeprunner(pkg, pkgfiles, rpmdeps, pkgdest):
import re, subprocess, shlex
- (pkg, pkgfiles, rpmdeps, pkgdest) = arg
provides = {}
requires = {}
diff --git a/meta/lib/oe/utils.py b/meta/lib/oe/utils.py
index c9c7a470416..d272dd2b8da 100644
--- a/meta/lib/oe/utils.py
+++ b/meta/lib/oe/utils.py
@@ -316,7 +316,9 @@ def multiprocess_launch_mp(target, items, max_process,
extraargs=None):
items = list(items)
while (items and not errors) or launched:
if not errors and items and len(launched) < max_process:
- args = (items.pop(),)
+ args = items.pop()
+ if not type(args) is tuple:
+ args = (args,)
if extraargs is not None:
args = args + extraargs
p = ProcessLaunch(target=target, args=args)
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#212010):
https://lists.openembedded.org/g/openembedded-core/message/212010
Mute This Topic: https://lists.openembedded.org/mt/111414913/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
