mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #3840 from murrant/fix-validate-empty-modified

Browse Source 
Validate: Also check the output of git before saying there is modified files
This commit is contained in:
Neil Lathwood
2016-07-14 23:37:03 +01:00
committed by GitHub
parent c88706531b aa23223f71
commit fdf68a83b3
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
validate.php
View File

@ -93,9 +93,9 @@ if($username === 'root') {
$modifiedcmd = 'su '.$config['user'].' -c "'.$modifiedcmd.'"'; $modifiedcmd = 'su '.$config['user'].' -c "'.$modifiedcmd.'"';
} }
exec($modifiedcmd, $cmdoutput, $code); exec($modifiedcmd, $cmdoutput, $code);
if($code !== 0) { if($code !== 0 && !empty($cmdoutput)) {
print_warn("Your local git contains modified files, this could prevent automatic updates.\nModified files:"); print_warn("Your local git contains modified files, this could prevent automatic updates.\nModified files:");
echo(implode("\n", $cmdoutput) . "\n"); echo(' ' . implode("\n ", $cmdoutput) . "\n");
} }
echo "DB Schema: ".$versions['db_schema']."\n"; echo "DB Schema: ".$versions['db_schema']."\n";