diff options
author | John Wiegley <johnw@newartisans.com> | 2009-01-21 18:53:52 -0400 |
---|---|---|
committer | John Wiegley <johnw@newartisans.com> | 2009-01-21 18:53:52 -0400 |
commit | a5e2fa42bbf3a1b49f916840b756ce9daeafde5d (patch) | |
tree | 56795ddeadfe306d5549644603a5ffefe25fa48c /parser.cc | |
parent | ebae0257fbb3cc420cdde80236ae63f6a1ab612e (diff) | |
download | ledger-a5e2fa42bbf3a1b49f916840b756ce9daeafde5d.tar.gz ledger-a5e2fa42bbf3a1b49f916840b756ce9daeafde5d.tar.bz2 ledger-a5e2fa42bbf3a1b49f916840b756ce9daeafde5d.zip |
Changed the order in which options are processed, to provide for the correct
overrides.
1. Global defaults
2. Environment variable settings
3. Initialization file
4. Command-line arguments
Whatever is later in the list overrides what is earlier.
Diffstat (limited to 'parser.cc')
-rw-r--r-- | parser.cc | 11 |
1 files changed, 0 insertions, 11 deletions
@@ -114,17 +114,6 @@ unsigned int parse_ledger_data(config_t& config, DEBUG_PRINT("ledger.config.cache", "3. use_cache = " << config.use_cache); - if (! config.init_file.empty() && - access(config.init_file.c_str(), R_OK) != -1) { - if (parse_journal_file(config.init_file, config, journal) || - journal->auto_entries.size() > 0 || - journal->period_entries.size() > 0) - throw new error(std::string("Entries found in initialization file '") + - config.init_file + "'"); - - journal->sources.pop_front(); // remove init file - } - if (config.use_cache && ! config.cache_file.empty() && config.cache_file != "<none>" && ! config.data_file.empty()) { DEBUG_PRINT("ledger.config.cache", |