# # # patch "lua_hooks.cc" # from [e61801cae30ad803e68f8419729619159719137a] # to [26dbfb8306a7b7b4871f61877c7fd0f72abadfdd] # # patch "mt_version.cc" # from [72c6a402aaeb10deb10b914775b3c90a461042fa] # to [3e984b954e17538a14e1ece58493fcb3afef8846] # ============================================================ --- lua_hooks.cc e61801cae30ad803e68f8419729619159719137a +++ lua_hooks.cc 26dbfb8306a7b7b4871f61877c7fd0f72abadfdd @@ -187,8 +187,24 @@ lua_hooks::load_rcfile(any_path const & lua_hooks::load_rcfile(any_path const & rc, bool required) { I(st); - if (path_exists(rc)) + bool exists; + try { + exists = path_exists(rc); + } + catch (informative_failure & e) + { + if (!required) + { + L(FL("skipping rcfile '%s': %s") % rc % e.what()); + return; + } + else + throw; + } + + if (exists) + { L(FL("opening rcfile '%s'") % rc); N(run_file(st, rc.as_external().c_str()), F("lua error while loading '%s'") % rc); ============================================================ --- mt_version.cc 72c6a402aaeb10deb10b914775b3c90a461042fa +++ mt_version.cc 3e984b954e17538a14e1ece58493fcb3afef8846 @@ -31,7 +31,7 @@ using std::string; using std::ostringstream; using std::string; -CMD(version, "version", "", CMD_REF(informative), "", +CMD_NO_WORKSPACE(version, "version", "", CMD_REF(informative), "", N_("Shows the program version"), "", options::opts::full)