[ptxdist] [PATCH v2] configure_helper.py: check for emptyish ptxdist environment variables

[Roland Hieber <rhi@pengutronix.de>]

When the environment variable exists, but is empty, os.environment.get()
will return its value instead of using the supplied default. Check for
cases like that to prevent calling an empty command.

Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
 v1 -> v2:
  - prevent "AttributeError: 'NoneType' object has no attribute 'strip'"
    if none of the checked environment variables are set

 scripts/configure_helper.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/scripts/configure_helper.py b/scripts/configure_helper.py
index c7b46f3b3846..73dd4a2add1c 100755
--- a/scripts/configure_helper.py
+++ b/scripts/configure_helper.py
@@ -151,7 +151,12 @@ def abort(message):
 	exit(1)
 
 def ask_ptxdist(pkg):
-	ptxdist = os.environ.get("PTXDIST", os.environ.get("ptxdist", "ptxdist"))
+	ptxdist = os.environ.get("PTXDIST")
+	if not ptxdist or not ptxdist.strip():
+		ptxdist = os.environ.get("ptxdist")
+	if not ptxdist or not ptxdist.strip():
+		ptxdist = "ptxdist"
+	
 	p = subprocess.Popen([ ptxdist, "-k", "make",
 		"/print-%s_DIR" % pkg,
 		"/print-%s_SUBDIR" % pkg,
-- 
2.23.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de