summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@users.noreply.github.com>2016-12-19 08:37:43 +0100
committerGitHub <noreply@github.com>2016-12-19 08:37:43 +0100
commitf54547ff1c992f44f32d5147535ac77d808a2b79 (patch)
treecf9409bd43071e15ac49eaf0848cf1aa3f02085b /core
parent8a21fc0908ff1edf11231a0b5da334d8f7538f84 (diff)
parent93a8eba1375678f69ba666f5fedde602a911c58c (diff)
downloadnextcloud-server-f54547ff1c992f44f32d5147535ac77d808a2b79.tar.gz
nextcloud-server-f54547ff1c992f44f32d5147535ac77d808a2b79.zip
Merge pull request #2723 from nextcloud/integrity-exit-code
[downstream] Return 1 if integrity check is failed. Fixes #22806
Diffstat (limited to 'core')
-rw-r--r--core/Command/Integrity/CheckApp.php3
-rw-r--r--core/Command/Integrity/CheckCore.php3
2 files changed, 6 insertions, 0 deletions
diff --git a/core/Command/Integrity/CheckApp.php b/core/Command/Integrity/CheckApp.php
index 0774cca6582..3e4d8b9cba7 100644
--- a/core/Command/Integrity/CheckApp.php
+++ b/core/Command/Integrity/CheckApp.php
@@ -66,6 +66,9 @@ class CheckApp extends Base {
$path = strval($input->getOption('path'));
$result = $this->checker->verifyAppSignature($appid, $path);
$this->writeArrayInOutputFormat($input, $output, $result);
+ if (count($result)>0){
+ return 1;
+ }
}
}
diff --git a/core/Command/Integrity/CheckCore.php b/core/Command/Integrity/CheckCore.php
index 5aaf9c2dec8..a3426ce9345 100644
--- a/core/Command/Integrity/CheckCore.php
+++ b/core/Command/Integrity/CheckCore.php
@@ -60,5 +60,8 @@ class CheckCore extends Base {
protected function execute(InputInterface $input, OutputInterface $output) {
$result = $this->checker->verifyCoreSignature();
$this->writeArrayInOutputFormat($input, $output, $result);
+ if (count($result)>0){
+ return 1;
+ }
}
}