X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fconfig.cpp;h=a83a641a5bcaa66dbfcf2eda1ee477ab13648306;hb=afed9d3a6326790b77b786cbc1e76b725a14dbe5;hp=fbb36ac3d5cc32b1e3bec7fb63b917cc3879ab03;hpb=f5d3127099bc41f986094eb98732849ee9bfb748;p=builder.git diff --git a/source/config.cpp b/source/config.cpp index fbb36ac..a83a641 100644 --- a/source/config.cpp +++ b/source/config.cpp @@ -66,7 +66,7 @@ void Config::select_last_profile() { try { - IO::File in((package.get_source()/".profile.cache").str()); + IO::File in((package.get_source()/".profile").str()); string profile; in.getline(profile); set_option("profile", profile); @@ -91,7 +91,7 @@ void Config::select_profile(const string &profile) if(!package.get_builder().get_dry_run()) { - IO::File out((package.get_source()/".profile.cache").str(), IO::M_WRITE); + IO::File out((package.get_source()/".profile").str(), IO::M_WRITE); IO::print(out, "%s\n", profile); } @@ -207,11 +207,7 @@ bool Config::set_option(const string &opt, const string &val) void Config::load() { - FS::Path fn=package.get_source()/".options.cache"; - - OptionMap::iterator i=options.find("profile"); - if(i!=options.end()) - fn=package.get_source()/(".options."+i->second.value+".cache"); + FS::Path fn=package.get_source()/(".options."+get_option("profile").value); try {