If a ledger file is specified in .ledgerrc, ignore the environment.
This commit is contained in:
parent
455b6e27cb
commit
4f5799c216
3 changed files with 5 additions and 4 deletions
|
|
@ -60,8 +60,9 @@ global_scope_t::global_scope_t(char ** envp)
|
|||
// Before processing command-line options, we must notify the session object
|
||||
// that such options are beginning, since options like -f cause a complete
|
||||
// override of files found anywhere else.
|
||||
session().now_at_command_line(false);
|
||||
session().set_flush_on_next_data_file(true);
|
||||
read_environment_settings(envp);
|
||||
session().set_flush_on_next_data_file(true);
|
||||
read_init();
|
||||
}
|
||||
|
||||
|
|
@ -144,7 +145,7 @@ void global_scope_t::report_error(const std::exception& err)
|
|||
|
||||
void global_scope_t::execute_command(strings_list args, bool at_repl)
|
||||
{
|
||||
session().now_at_command_line(true);
|
||||
session().set_flush_on_next_data_file(true);
|
||||
|
||||
// Process the command verb, arguments and options
|
||||
args = read_command_arguments(report(), args);
|
||||
|
|
|
|||
|
|
@ -78,7 +78,7 @@ int main(int argc, char * argv[], char * envp[])
|
|||
std::auto_ptr<global_scope_t> global_scope(new global_scope_t(envp));
|
||||
|
||||
try {
|
||||
global_scope->session().now_at_command_line(true);
|
||||
global_scope->session().set_flush_on_next_data_file(true);
|
||||
|
||||
// Construct an STL-style argument list from the process command arguments
|
||||
strings_list args;
|
||||
|
|
|
|||
|
|
@ -75,7 +75,7 @@ public:
|
|||
TRACE_DTOR(session_t);
|
||||
}
|
||||
|
||||
void now_at_command_line(const bool truth) {
|
||||
void set_flush_on_next_data_file(const bool truth) {
|
||||
flush_on_next_data_file = true;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue