From 14e2cafe21eebd5f6c40c9c0a542ae14a4f21296 Mon Sep 17 00:00:00 2001 From: Barry Warsaw Date: Tue, 6 Oct 1998 15:21:04 +0000 Subject: [PATCH] usage(): Print msg at end of docstring main(): Fixed logic error and reporting when no colordb was found. Given by GvR. --- Tools/pynche/Main.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Tools/pynche/Main.py b/Tools/pynche/Main.py index 403f8b1f9f..700d2f986f 100644 --- a/Tools/pynche/Main.py +++ b/Tools/pynche/Main.py @@ -55,9 +55,9 @@ RGB_TXT = [ def usage(status, msg=''): + print __doc__ % globals() if msg: print msg - print __doc__ % globals() sys.exit(status) @@ -88,11 +88,12 @@ def main(): for f in RGB_TXT: try: colordb = ColorDB.get_colordb(f) - break + if colordb: + break except IOError: pass else: - raise IOError('No color database file found') + usage(1, 'No color database file found, see the -d option.') # get triplet for initial color try: -- 2.50.1