From: david d zuhn <david.zuhn@sonos.com>
To: bitbake-devel@lists.openembedded.org
Cc: david d zuhn <david.zuhn@sonos.com>
Subject: [PATCH] bitbake-worker: allow '=' in environment variable values
Date: Mon, 18 Mar 2024 13:50:05 -0500 [thread overview]
Message-ID: <20240318185005.2487115-1-david.zuhn@sonos.com> (raw)
Limit the split to key & value (2 items) instead of the n items one
can get if there are '=' characters in the value.
Fixes [YOCTO #15447]
Signed-off-by: david d zuhn <david.zuhn@sonos.com>
---
bin/bitbake-worker | 4 ++--
lib/bb/runqueue.py | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/bin/bitbake-worker b/bin/bitbake-worker
index eba9c562..891d4796 100755
--- a/bin/bitbake-worker
+++ b/bin/bitbake-worker
@@ -183,7 +183,7 @@ def fork_off_task(cfg, data, databuilder, workerdata, extraconfigdata, runtask):
if 'fakeroot' in taskdep and taskname in taskdep['fakeroot'] and not dry_run:
fakeroot = True
envvars = (runtask['fakerootenv'] or "").split()
- for key, value in (var.split('=') for var in envvars):
+ for key, value in (var.split('=',1) for var in envvars):
envbackup[key] = os.environ.get(key)
os.environ[key] = value
fakeenv[key] = value
@@ -195,7 +195,7 @@ def fork_off_task(cfg, data, databuilder, workerdata, extraconfigdata, runtask):
(fn, taskname, ', '.join(fakedirs)))
else:
envvars = (runtask['fakerootnoenv'] or "").split()
- for key, value in (var.split('=') for var in envvars):
+ for key, value in (var.split('=',1) for var in envvars):
envbackup[key] = os.environ.get(key)
os.environ[key] = value
fakeenv[key] = value
diff --git a/lib/bb/runqueue.py b/lib/bb/runqueue.py
index 6987de3e..bc7e1817 100644
--- a/lib/bb/runqueue.py
+++ b/lib/bb/runqueue.py
@@ -1359,7 +1359,7 @@ class RunQueue:
fakerootcmd = shlex.split(mcdata.getVar("FAKEROOTCMD"))
fakerootenv = (mcdata.getVar("FAKEROOTBASEENV") or "").split()
env = os.environ.copy()
- for key, value in (var.split('=') for var in fakerootenv):
+ for key, value in (var.split('=',1) for var in fakerootenv):
env[key] = value
worker = subprocess.Popen(fakerootcmd + [sys.executable, workerscript, magic], stdout=subprocess.PIPE, stdin=subprocess.PIPE, env=env)
fakerootlogs = self.rqdata.dataCaches[mc].fakerootlogs
--
2.26.2
reply other threads:[~2024-03-18 18:50 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240318185005.2487115-1-david.zuhn@sonos.com \
--to=david.zuhn@sonos.com \
--cc=bitbake-devel@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).