X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fconfig.cpp;h=a518b6302f8fd6cdea0fb4fd4d5e06fd06f991bc;hb=1d687970cc35e54c3335f4aa2fdef23424fe0a06;hp=afb86ea7b2b4ff15a676662ecde6eaf003db63b8;hpb=43bd25ffcb0b4f7882773f4676b209a99cb73c04;p=builder.git diff --git a/source/config.cpp b/source/config.cpp index afb86ea..a518b63 100644 --- a/source/config.cpp +++ b/source/config.cpp @@ -33,15 +33,14 @@ bool Config::is_option(const string &name) const void Config::select_last_profile() { - try + FS::Path profile_cache_fn = package.get_source()/".profile"; + if(FS::exists(profile_cache_fn)) { - IO::BufferedFile in((package.get_source()/".profile").str()); + IO::BufferedFile in(profile_cache_fn.str()); string profile; in.getline(profile); set_option("profile", profile); } - catch(const IO::file_not_found &) - { } freeze_mtime = true; package.get_builder().apply_profile_template(*this, get_option("profile").value); @@ -121,18 +120,17 @@ void Config::load() { FS::Path fn = package.get_source()/(".options."+get_option("profile").value); - try + FS::Stat stat = FS::stat(fn); + if(stat) { IO::BufferedFile in(fn.str()); - mtime = FS::stat(fn).get_modify_time(); + mtime = stat.get_modify_time(); DataFile::Parser parser(in, fn.str()); Loader loader(*this); loader.load(parser); } - catch(const IO::file_not_found &) - { } }