[MERGE] forward port of branch 7.0 up to d2fd05e
This commit is contained in:
commit
309ca4fcf7
|
@ -340,8 +340,8 @@ class configmanager(object):
|
||||||
"the i18n-export option cannot be used without the database (-d) option")
|
"the i18n-export option cannot be used without the database (-d) option")
|
||||||
|
|
||||||
# Check if the config file exists (-c used, but not -s)
|
# Check if the config file exists (-c used, but not -s)
|
||||||
die(not opt.save and opt.config and not os.path.exists(opt.config),
|
die(not opt.save and opt.config and not os.access(opt.config, os.R_OK),
|
||||||
"The config file '%s' selected with -c/--config doesn't exist, "\
|
"The config file '%s' selected with -c/--config doesn't exist or is not readable, "\
|
||||||
"use -s/--save if you want to generate it"% opt.config)
|
"use -s/--save if you want to generate it"% opt.config)
|
||||||
|
|
||||||
# place/search the config file on Win32 near the server installation
|
# place/search the config file on Win32 near the server installation
|
||||||
|
|
Loading…
Reference in New Issue