gergely/taskwarrior-2.x
1
0
Fork 0
Code Issues Actions Packages Projects Releases 1 Wiki Activity

Bug

Browse Source 
- Fixed bug where shadow files are not properly created when there is a missing
  .taskrc file.

Signed-off-by: Paul Beckingham <paul@beckingham.net>
This commit is contained in:
Pietro Cerutti
2012-09-18 07:50:55 -04:00
committed by Paul Beckingham
parent eb09f4da9a
commit 1c5068edb2
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -5,6 +5,8 @@
Bugs Bugs
+ Bug fix release regarding #1104, which causes duplicate UUIDs during + Bug fix release regarding #1104, which causes duplicate UUIDs during
the merge command. the merge command.
+ Fixed bug where shadow files are not properly created when there is a missing
.taskrc file (thanks to Pietro Cerutti).
------ old releases ------------------------------ ------ old releases ------------------------------

16
src/Context.cpp
View File

@@ -503,6 +503,7 @@ void Context::shadow ()
{ {
std::string file_name = config.get ("shadow.file"); std::string file_name = config.get ("shadow.file");
std::string command = config.get ("shadow.command"); std::string command = config.get ("shadow.command");
std::string rcfile = rc_file;
// A missing shadow file command uses the default command instead. // A missing shadow file command uses the default command instead.
if (command == "") if (command == "")
@@ -534,13 +535,14 @@ void Context::shadow ()
// Compose the command. Put the rc overrides up front, so that they may // Compose the command. Put the rc overrides up front, so that they may
// be overridden by rc.shadow.command. // be overridden by rc.shadow.command.
command = program + command = program +
" rc.detection:off" + // No need to determine terminal size " rc.detection:off" + // No need to determine terminal size
" rc.color:off" + // Color off by default " rc.color:off" + // Color off by default
" rc.gc:off " + // GC off, to reduce headaches " rc.gc:off " + // GC off, to reduce headaches
command + // User specified command " rc:" + rcfile + " " + // Use specified rc file
" >" + // Capture command + // User specified command
shadow_file._data; // User specified file " >" + // Capture
shadow_file._data; // User specified file
debug ("Running shadow command: " + command); debug ("Running shadow command: " + command);
system (command.c_str ()); system (command.c_str ());