jenkins-bot has submitted this change and it was merged.
Change subject: Fix how 'current' branch is determined in
updateBitsBranchPointers
......................................................................
Fix how 'current' branch is determined in updateBitsBranchPointers
updateBitsBranchPointers should determine 'current' by globbing directory names
in /a/common, not /usr/local/apache/common-local, since the new branch is not
there yet when updateBitsBranchPointers is called from checkoutMediaWiki.
Change-Id: I1e6c5a3b8f29a7cfacc30e6bb4220311850580a2
---
M multiversion/updateBitsBranchPointers
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Reedy: Looks good to me, approved
jenkins-bot: Verified
diff --git a/multiversion/updateBitsBranchPointers
b/multiversion/updateBitsBranchPointers
index 0cfbb7d..556a787 100755
--- a/multiversion/updateBitsBranchPointers
+++ b/multiversion/updateBitsBranchPointers
@@ -20,10 +20,10 @@
}
function updateBitsBranchPointers( $dryRun = false ) {
- $branchDirs = glob( MULTIVER_COMMON_APACHE . '/php-*', GLOB_ONLYDIR );
+ $branchDirs = glob( MULTIVER_COMMON_HOME . '/php-*', GLOB_ONLYDIR );
if ( !is_array( $branchDirs ) || count( $branchDirs ) < 1 ) {
- fwrite( STDERR, __FUNCTION__ . ': no deployment branch
directories found in ' . MULTIVER_COMMON_APACHE . "\n" );
+ fwrite( STDERR, __FUNCTION__ . ': no deployment branch
directories found in ' . MULTIVER_COMMON_HOME . "\n" );
exit( 1 );
}
--
To view, visit https://gerrit.wikimedia.org/r/94280
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1e6c5a3b8f29a7cfacc30e6bb4220311850580a2
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: Reedy <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
