Small change in NewPatches script

This commit is contained in:
DariusIII
2017-04-21 11:18:21 +02:00
parent ed16df9af2
commit b7f5ac9a87
+3 -3
View File
@@ -33,7 +33,7 @@ $error = false;
$git = new Git();
$branch = $git->active_branch();
if (in_array($branch, $git->mainBranches())) {
if (in_array($branch, $git->mainBranches(), false)) {
// Only update patches, etc. on specific branches to lessen conflicts
try {
// Run DbUpdates to make sure we're up to date.
@@ -41,8 +41,8 @@ if (in_array($branch, $git->mainBranches())) {
$DbUpdater->newPatches(['safe' => false]);
} catch (\Exception $e) {
$error = 1;
echo "Error while checking patches!\n";
echo $e->getMessage() . "\n";
echo 'Error while checking patches!' . PHP_EOL;
echo $e->getMessage() . PHP_EOL;
}
}