diff options
| author | Bob Jamison <ishmalius@gmail.com> | 2008-08-26 14:02:46 +0000 |
|---|---|---|
| committer | ishmal <ishmal@users.sourceforge.net> | 2008-08-26 14:02:46 +0000 |
| commit | 1b54ab5e03f7d5b2ce6fa61139fcf252c4084cdb (patch) | |
| tree | fae8e9f00ea30fcfb5edb9681cf800a59ebf2790 /buildtool.cpp | |
| parent | fixed bug in removeFile() (diff) | |
| download | inkscape-1b54ab5e03f7d5b2ce6fa61139fcf252c4084cdb.tar.gz inkscape-1b54ab5e03f7d5b2ce6fa61139fcf252c4084cdb.zip | |
enable failOnError in TaskDelete
(bzr r6717)
Diffstat (limited to 'buildtool.cpp')
| -rw-r--r-- | buildtool.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/buildtool.cpp b/buildtool.cpp index a7d087690..23d265f02 100644 --- a/buildtool.cpp +++ b/buildtool.cpp @@ -7600,7 +7600,6 @@ public: bool verbose = parent.evalBool(verboseOpt, false); bool quiet = parent.evalBool(quietOpt, false); bool failOnError = parent.evalBool(failOnErrorOpt, true); - struct stat finfo; switch (delType) { case DEL_FILE: @@ -7610,7 +7609,7 @@ public: char *fname = (char *)fullName.c_str(); if (!quiet && verbose) taskstatus("path: %s", fname); - if (!removeFile(fullName)) + if (failOnError && !removeFile(fullName)) { //error("Could not delete file '%s'", fullName.c_str()); return false; @@ -7623,7 +7622,7 @@ public: String fullDir = parent.resolve(dirName); if (!quiet && verbose) taskstatus("path: %s", fullDir.c_str()); - if (!removeDirectory(fullDir)) + if (failOnError && !removeDirectory(fullDir)) { //error("Could not delete directory '%s'", fullDir.c_str()); return false; |