Signed-off-by: Stefan Huber <shuber@sthu.org>
if __name__ == "__main__":
if __name__ == "__main__":
- conffn = os.path.expanduser("~/.smailq.conf")
+ conffn_list = [os.path.expanduser("~/.smailq.conf"), "/etc/smailq.conf"]
cmd = "--list"
nooptargs = []
cmd = "--list"
nooptargs = []
'--deliver']:
cmd = opt
elif opt in ['-C', '--config']:
'--deliver']:
cmd = opt
elif opt in ['-C', '--config']:
elif opt in ['-v', '--verbose']:
verbose = True
quiet = False
elif opt in ['-v', '--verbose']:
verbose = True
quiet = False
sys.exit(os.EX_USAGE)
# Reading config file
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:
sys.exit(os.EX_IOERR)
conf = None
try: