mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
From: Roland Hieber <rhi@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Roland Hieber <rhi@pengutronix.de>
Subject: [ptxdist] [PATCH v2] configure_helper.py: check for emptyish ptxdist environment variables
Date: Wed, 25 Sep 2019 15:13:40 +0200	[thread overview]
Message-ID: <20190925131339.17018-1-rhi@pengutronix.de> (raw)
In-Reply-To: <20190911075048.8125-1-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

  parent reply	other threads:[~2019-09-25 13:13 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-09-11  7:50 [ptxdist] [PATCH] " Roland Hieber
2019-09-23  8:46 ` Roland Hieber
2019-09-25 13:13 ` Roland Hieber [this message]
2019-10-16 10:53   ` [ptxdist] [PATCH v2] " Roland Hieber
2019-10-16 11:38     ` Michael Olbrich
2019-10-16 11:58       ` Roland Hieber
2019-10-16 13:26         ` Michael Olbrich
2019-10-17  8:24           ` Roland Hieber
2019-10-17  8:41 ` [ptxdist] [PATCH v3] configure_helper.py: be more verbose when calling ptxdist fails Roland Hieber

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=20190925131339.17018-1-rhi@pengutronix.de \
    --to=rhi@pengutronix.de \
    --cc=ptxdist@pengutronix.de \
    /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