From mboxrd@z Thu Jan  1 00:00:00 1970
Return-path: <ptxdist-bounces@pengutronix.de>
Date: Wed, 16 Oct 2019 12:53:10 +0200
From: Roland Hieber <rhi@pengutronix.de>
Message-ID: <20191016105310.w3fmq26kuahbyrob@pengutronix.de>
References: <20190911075048.8125-1-rhi@pengutronix.de>
 <20190925131339.17018-1-rhi@pengutronix.de>
MIME-Version: 1.0
Content-Disposition: inline
In-Reply-To: <20190925131339.17018-1-rhi@pengutronix.de>
Subject: Re: [ptxdist] [PATCH v2] configure_helper.py: check for emptyish
 ptxdist environment variables
List-Id: PTXdist Development Mailing List <ptxdist.pengutronix.de>
List-Unsubscribe: <http://metis.pengutronix.de/cgi-bin/mailman/options/ptxdist>, 
 <mailto:ptxdist-request@pengutronix.de?subject=unsubscribe>
List-Archive: <http://metis.pengutronix.de/cgi-bin/mailman/private/ptxdist/>
List-Post: <mailto:ptxdist@pengutronix.de>
List-Help: <mailto:ptxdist-request@pengutronix.de?subject=help>
List-Subscribe: <http://metis.pengutronix.de/cgi-bin/mailman/listinfo/ptxdist>, 
 <mailto:ptxdist-request@pengutronix.de?subject=subscribe>
Reply-To: ptxdist@pengutronix.de
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: ptxdist-bounces@pengutronix.de
Sender: "ptxdist" <ptxdist-bounces@pengutronix.de>
To: Michael Olbrich <m.olbrich@pengutronix.de>
Cc: ptxdist@pengutronix.de

Michael, any comments? It does not seem to be applied yet.

 - Roland

On Wed, Sep 25, 2019 at 03:13:40PM +0200, Roland Hieber wrote:
> 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
> 

-- 
Roland Hieber                     | r.hieber@pengutronix.de     |
Pengutronix e.K.                  | https://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim | Phone: +49-5121-206917-5086 |
Amtsgericht Hildesheim, HRA 2686  | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de