summaryrefslogtreecommitdiff
path: root/src/global.cc
diff options
context:
space:
mode:
authorJohn Wiegley <johnw@newartisans.com>2013-06-02 19:19:59 -0700
committerJohn Wiegley <johnw@newartisans.com>2013-06-02 19:19:59 -0700
commit85ba3bd1ca36c0ce4dbb053eaf2bc93e8f0710fa (patch)
tree057770410d577efdca801afc6f59c8fe46f3f26b /src/global.cc
parenta7ee1a0aa42caa28b19ca69eee27601fc42190d6 (diff)
parentd56f9c4032653927caa4162f6bd31b7cd890cf27 (diff)
downloadfork-ledger-85ba3bd1ca36c0ce4dbb053eaf2bc93e8f0710fa.tar.gz
fork-ledger-85ba3bd1ca36c0ce4dbb053eaf2bc93e8f0710fa.tar.bz2
fork-ledger-85ba3bd1ca36c0ce4dbb053eaf2bc93e8f0710fa.zip
Merge pull request #191 from thdox/doc_diff_from_previous
Improve documentation about differences between ledger 2.6 and ledger 3.0
Diffstat (limited to 'src/global.cc')
-rw-r--r--src/global.cc8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/global.cc b/src/global.cc
index a4da6ead..0061ad76 100644
--- a/src/global.cc
+++ b/src/global.cc
@@ -399,11 +399,13 @@ void global_scope_t::read_environment_settings(char * envp[])
process_option("environ", "init-file", report(), p, "LEDGER_INIT");
}
if (const char * p = std::getenv("PRICE_HIST")) {
- if (! std::getenv("LEDGER_PRICEDB"))
+ if (! std::getenv("LEDGER_PRICE_DB"))
process_option("environ", "price-db", report(), p, "PRICE_HIST");
}
- if (const char * p = std::getenv("PRICE_EXP"))
- process_option("environ", "price-exp", report(), p, "PRICE_EXP");
+ if (const char * p = std::getenv("PRICE_EXP")) {
+ if (! std::getenv("LEDGER_PRICE_EXP"))
+ process_option("environ", "price-exp", report(), p, "PRICE_EXP");
+ }
#endif
TRACE_FINISH(environment, 1);