From 4fbe052b37ddedb7ae917916f6670ce6242e3b01 Mon Sep 17 00:00:00 2001 From: Matei David Date: Fri, 8 May 2015 12:37:52 -0400 Subject: [PATCH 1/1] smailq: Look for global configuration under /etc Signed-off-by: Stefan Huber --- smailq | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/smailq b/smailq index def0a0a..d719d43 100755 --- a/smailq +++ b/smailq @@ -395,7 +395,7 @@ OPTIONS: if __name__ == "__main__": - conffn = os.path.expanduser("~/.smailq.conf") + conffn_list = [os.path.expanduser("~/.smailq.conf"), "/etc/smailq.conf"] cmd = "--list" nooptargs = [] @@ -416,7 +416,7 @@ if __name__ == "__main__": '--deliver']: cmd = opt elif opt in ['-C', '--config']: - conffn = arg + conffn_list = [arg] elif opt in ['-v', '--verbose']: verbose = True quiet = False @@ -432,8 +432,9 @@ if __name__ == "__main__": sys.exit(os.EX_USAGE) # Reading config file - if not os.path.isfile(conffn): - printerr("No such config file:", conffn) + conffn = next((f for f in conffn_list if os.path.isfile(f)), None) + if conffn is None: + printerr("No config file found: " + str(conffn_list)) sys.exit(os.EX_IOERR) conf = None try: -- 2.30.2