From 571e7e01f65fae74f2f4308cd77bf9ed3fe9d144 Mon Sep 17 00:00:00 2001 From: Michael Droettboom Date: Mon, 1 Apr 2013 14:37:57 -0400 Subject: [PATCH 1/2] Fix bug where basedirlist was treated as a single string --- setup.cfg.template | 2 +- setupext.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.cfg.template b/setup.cfg.template index 4b56914b29dc..0c0848f5537a 100644 --- a/setup.cfg.template +++ b/setup.cfg.template @@ -5,7 +5,7 @@ [directories] # Uncomment to override the default basedir in setupext.py. -# This can be a single directory or a space-delimited list of directories. +# This can be a single directory or a comma-delimited list of directories. #basedirlist = /usr [status] diff --git a/setupext.py b/setupext.py index 85ff433559fd..239290aee933 100644 --- a/setupext.py +++ b/setupext.py @@ -77,7 +77,7 @@ def check_output(*popenargs, **kwargs): pass try: - options['basedirlist'] = config.get("directories", "basedirlist") + options['basedirlist'] = config.get("directories", "basedirlist").split(',') except: pass else: From 31c880f7be003f3edc428fd67af1d4527dddc6d8 Mon Sep 17 00:00:00 2001 From: Michael Droettboom Date: Tue, 2 Apr 2013 08:44:16 -0400 Subject: [PATCH 2/2] Strip each entry of basedirlist --- setupext.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/setupext.py b/setupext.py index 239290aee933..63109aed297b 100644 --- a/setupext.py +++ b/setupext.py @@ -77,7 +77,9 @@ def check_output(*popenargs, **kwargs): pass try: - options['basedirlist'] = config.get("directories", "basedirlist").split(',') + options['basedirlist'] = [ + x.strip() for x in + config.get("directories", "basedirlist").split(',')] except: pass else: