X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fconfig.cpp;h=a518b6302f8fd6cdea0fb4fd4d5e06fd06f991bc;hb=6f76342d14c7b7ec7b9629fcfd40199bca1e5e0f;hp=87573e22360d5a765a12e5412616364b6f0ffa18;hpb=0458300fda4f345f865a7f3ee4fc0f2020a91983;p=builder.git diff --git a/source/config.cpp b/source/config.cpp index 87573e2..a518b63 100644 --- a/source/config.cpp +++ b/source/config.cpp @@ -1,10 +1,3 @@ -/* $Id$ - -This file is part of builder -Copyright © 2006-2009 Mikko Rasa, Mikkosoft Productions -Distributed under the LGPL -*/ - #include #include #include @@ -40,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); @@ -128,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 &) - { } }