sfos/ledger
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'default-pricedb-bug' into kitchen-sink

Browse source
This commit is contained in:
Craig Earls 2013-01-29 14:15:25 -07:00
commit e032bb1c31
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/session.cc
View file

@ -62,12 +62,7 @@ void set_session_context(session_t * session)
session_t::session_t() session_t::session_t()
: flush_on_next_data_file(false), journal(new journal_t) : flush_on_next_data_file(false), journal(new journal_t)
{ {
if (const char * home_var = std::getenv("HOME")) parsing_context.push();
HANDLER(price_db_).on(none, (path(home_var) / ".pricedb").string());
else
HANDLER(price_db_).on(none, path("./.pricedb").string());
parsing_context.push();
TRACE_CTOR(session_t, ""); TRACE_CTOR(session_t, "");
} }
@ -101,7 +96,13 @@ std::size_t session_t::read_data(const string& master_account)
if (HANDLED(price_db_)){ if (HANDLED(price_db_)){
price_db_path = resolve_path(HANDLER(price_db_).str()); price_db_path = resolve_path(HANDLER(price_db_).str());
if (!exists(price_db_path.get())){ if (!exists(price_db_path.get())){
throw_(parse_error, _f("Could not find specified price file %1%") % price_db_path); throw_(parse_error, _f("Could not find specified price-db file %1%") % price_db_path);
}
} else {
if (const char * home_var = std::getenv("HOME")){
price_db_path = (path(home_var) / ".pricedb");
} else {
price_db_path = ("./.ledgerrc");
} }
} }