GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-08-20 13:23:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

CmdConfig: Do not leave empty line upon variable removal

Browse source
This commit is contained in:
Tomas Babej 2015-02-24 07:31:03 +01:00 • committed by Paul Beckingham
parent bf5f246168
commit 0868ba757c
1 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/commands/CmdConfig.cpp
View file

@ -107,8 +107,10 @@ int CmdConfig::unsetConfigVariable (std::string name, bool confirmation /* = fal
bool change = false; bool change = false;
std::vector <std::string>::iterator line; std::vector <std::string>::iterator line;
for (line = contents.begin (); line != contents.end (); ++line) for (line = contents.begin (); line != contents.end (); )
{ {
bool lineDeleted = false;
// If there is a comment on the line, it must follow the pattern. // If there is a comment on the line, it must follow the pattern.
std::string::size_type comment = line->find ("#"); std::string::size_type comment = line->find ("#");
std::string::size_type pos = line->find (name + "="); std::string::size_type pos = line->find (name + "=");
@ -123,10 +125,15 @@ int CmdConfig::unsetConfigVariable (std::string name, bool confirmation /* = fal
if (!confirmation || if (!confirmation ||
confirm (format (STRING_CMD_CONFIG_CONFIRM3, name))) confirm (format (STRING_CMD_CONFIG_CONFIRM3, name)))
{ {
*line = ""; // vector::erase method returns a valid iterator to the next object
line = contents.erase (line);
lineDeleted = true;
change = true; change = true;
} }
} }
if (! lineDeleted)
line++;
} }
if (change) if (change)