From 5b400ead742f3fa24f71b04848a5e6feb20bf09c Mon Sep 17 00:00:00 2001 From: Kostas Date: Fri, 14 Aug 2015 10:42:39 +0000 Subject: [PATCH] Fixed issue with detached execution not returning the correct result status FossilOrigin-Name: 28d8e8098a1f1d19ce8494c1926dad0490632b82 --- manifest | 12 ++++++------ manifest.uuid | 2 +- src/Fossil.cpp | 7 ++++++- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/manifest b/manifest index 3f43b9b..ea718aa 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Refactored\sand\sunified\sworkspace\spath\sfunctions\n -D 2015-08-14T10:00:31.654 +C Fixed\sissue\swith\sdetached\sexecution\snot\sreturning\sthe\scorrect\sresult\sstatus\n +D 2015-08-14T10:42:39.221 F .travis.yml 77966888a81c4ceee1fcc79bce842c9667ad8a35 F debian/changelog eb4304dfcb6bb66850ec740838090eb50ce1249b F debian/compat b6abd567fa79cbe0196d093a067271361dc6ca8b @@ -225,7 +225,7 @@ F src/FileActionDialog.cpp fcaebf9986f789b3440d5390b3458ad5f86fe0c8 F src/FileActionDialog.h 15db1650b3a13d70bc338371e4c033c66e3b79ce F src/FileTableView.cpp 5ddf8c391c9a3ac449ec61fb1db837b577afeec2 F src/FileTableView.h 03e56d87c2d46411b9762b87f4d301619aaf18df -F src/Fossil.cpp 3cd636a3bbb73fefbb6cb2039e14b06a04bbe20e +F src/Fossil.cpp 65fec7298d8535ad170e74af14f86e1889dd4084 F src/Fossil.h 85fdba2fafe735f22ef9dee20f4fbb3f3c31e47a F src/FslSettingsDialog.cpp e00907d493fba469e48a008aecda88426350b5ac F src/FslSettingsDialog.h dfe2a61884a55a74cbb9206b6f6b482b979725e7 @@ -260,7 +260,7 @@ F ui/MainWindow.ui 10181826a25056ed5aba2b23a7d110159be7c043 F ui/RemoteDialog.ui 95a4750d972ed8c49bb10b95db91ff16cfe2dd0b F ui/RevisionDialog.ui 27c3b98c665fec014a50cbf3352c0627f75e68cd F ui/SettingsDialog.ui 47b9a31e28ad523f14a1c4cd361270b6babbdf7d -P bc8becb1aa02ed969a3330a756e6c54ab1a2a67a -R 0d3af1bb2213b21e86edd60b6ede2498 +P 5e89247bf2fa2cf6d5720ddf51e091319ab66459 +R 095d87cb7fa113af20146a4ed0d80bc6 U Kostas -Z bf85cbde772d71d5ed8810b59851bc5a +Z d0dd174a392a7ed0b54c82c5439ed34b diff --git a/manifest.uuid b/manifest.uuid index 098e04b..359d7b0 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -5e89247bf2fa2cf6d5720ddf51e091319ab66459 \ No newline at end of file +28d8e8098a1f1d19ce8494c1926dad0490632b82 \ No newline at end of file diff --git a/src/Fossil.cpp b/src/Fossil.cpp index 5f37a63..026ba82 100644 --- a/src/Fossil.cpp +++ b/src/Fossil.cpp @@ -727,7 +727,12 @@ bool Fossil::runFossilRaw(const QStringList &args, QStringList *output, int *exi // Detached processes use the command-line only, to avoid having to wait // for the temporary args file to be released before returing if(detached) - return QProcess::startDetached(fossil, args, wkdir); + { + bool started = QProcess::startDetached(fossil, args, wkdir); + if(exitCode) + *exitCode = started ? EXIT_SUCCESS : EXIT_FAILURE; + return started; + } // Make status message QString status_msg = QObject::tr("Running Fossil");