From 71d72aec6e35709099bdd85f2eb69c37cc0c282d Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Sat, 5 Oct 2019 23:06:40 +0530 Subject: fix conditions --- configure.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.py b/configure.py index 0f12690..16bb8e7 100644 --- a/configure.py +++ b/configure.py @@ -61,7 +61,7 @@ def _tool_yarn(): p2 = Popen(['grep', 'No such file or directory'], stdin=p1.stdout, stdout=subprocess.PIPE) p1.stdout.close() # Allow p1 to receive a SIGPIPE if p2 exits output = p2.communicate()[0] - if output is b'': + if output is not b'': if _existence('cmdtest'): print('WARNING: cmdtest is installed, this can lead\nto know issues with yarn.') sys.exit('ERROR: wrong yarn binary installed, please remove the\nconflicting binary before continuing.') @@ -156,7 +156,7 @@ def main(): print(_tool_node()) posixlist = _tool_posix() for x in range(len(posixlist)): - if x is not '': + if x != '': print(posixlist[x] + "\n") -- cgit v1.2.3 From cbc00c008d5e03bb64c392c6a9e7046568b67ec2 Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Sat, 5 Oct 2019 23:25:21 +0530 Subject: fix output --- configure.py | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/configure.py b/configure.py index 16bb8e7..f78d932 100644 --- a/configure.py +++ b/configure.py @@ -73,32 +73,27 @@ def _tool_yarn(): def _tool_posix(): + messages = [] + tool_find = _existence('find') if tool_find is None: - msg_find = 'prerequiste find(1) not found.' - else: - msg_find = '' + messages.append('prerequiste find(1) not found.') tool_xargs = _existence('xargs') if tool_xargs is None: - msg_xargs = 'prerequiste xargs(1) not found.' - else: - msg_xargs = '' + messages.append('prerequiste xargs(1) not found.') tool_msgmerge = _existence('msgmerge') if tool_msgmerge is None: - msg_msgmerge = 'prerequiste msgmerge(1) not found.' - else: - msg_msgmerge = '' + messages.append('prerequiste msgmerge(1) not found.') - return [msg_find, msg_xargs, msg_msgmerge] + return messages def _read_prefix(): logging.basicConfig(level=logging.DEBUG) logger = logging.getLogger(__name__) - if 'DEBUG' in os.environ: logger.debug('PREFIX from argv') parser = argparse.ArgumentParser() @@ -155,9 +150,8 @@ def main(): f.close() print(_tool_node()) posixlist = _tool_posix() - for x in range(len(posixlist)): - if x != '': - print(posixlist[x] + "\n") - + for msg in posixlist: + print(posixlist[x]) -main() +if __name__ == "__main__": + main() -- cgit v1.2.3