[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-3' - tools/Config.cpp
Jan Holesovsky
kendy at collabora.com
Thu Mar 29 09:47:30 UTC 2018
tools/Config.cpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 7c860b1504fad23aeb85e7902134c0ae96e06d7c
Author: Jan Holesovsky <kendy at collabora.com>
Date: Wed Mar 28 09:26:56 2018 +0200
The return value of system() shouldn't be ignored.
Change-Id: I7422bfb3997c205333a8558884c65f2ff3795e38
Reviewed-on: https://gerrit.libreoffice.org/51980
Reviewed-by: pranavk <pranavk at collabora.co.uk>
Tested-by: pranavk <pranavk at collabora.co.uk>
diff --git a/tools/Config.cpp b/tools/Config.cpp
index 20723fe25..6134e0e94 100644
--- a/tools/Config.cpp
+++ b/tools/Config.cpp
@@ -197,6 +197,7 @@ int Config::main(const std::vector<std::string>& args)
return Application::EXIT_NOINPUT;
}
+ int retval = Application::EXIT_OK;
bool changed = false;
_loolConfig.load(ConfigFile);
@@ -328,7 +329,7 @@ int Config::main(const std::vector<std::string>& args)
const char command[] = "su lool --shell=/bin/sh -c 'loolwsd-systemplate-setup /opt/lool/systemplate " LO_PATH " >/dev/null 2>&1'";
std::cout << "Running the following command:" << std::endl
<< command << std::endl;
- system(command);
+ retval = system(command);
}
else
{
@@ -343,8 +344,7 @@ int Config::main(const std::vector<std::string>& args)
std::cout << "Saved" << std::endl;
}
- // This tool only handles options, nothing to do here
- return Application::EXIT_OK;
+ return retval;
}
POCO_APP_MAIN(Config);
More information about the Libreoffice-commits
mailing list