https://www.mediawiki.org/wiki/Special:Code/MediaWiki/114956
Revision: 114956
Author: catrope
Date: 2012-04-18 17:32:48 +0000 (Wed, 18 Apr 2012)
Log Message:
-----------
Update scripts for the new php-1.XXwmfX naming pattern
Modified Paths:
--------------
trunk/tools/mwmultiversion/multiversion/checkoutMediaWiki
trunk/tools/mwmultiversion/multiversion/deleteMediaWiki
Modified: trunk/tools/mwmultiversion/multiversion/checkoutMediaWiki
===================================================================
--- trunk/tools/mwmultiversion/multiversion/checkoutMediaWiki 2012-04-18
17:31:23 UTC (rev 114955)
+++ trunk/tools/mwmultiversion/multiversion/checkoutMediaWiki 2012-04-18
17:32:48 UTC (rev 114956)
@@ -24,7 +24,7 @@
$argsValid = false;
if ( count( $argv ) >= 3 ) {
$svnVersion = $argv[1]; // e.g. "X.XXwmfX"
- $dstVersion = $argv[2]; // e.g. "php-X.XXwmf1"
+ $dstVersion = $argv[2]; // e.g. "php-X.XXwmfX"
if ( preg_match( '/^php-(\d+\.\d+wmf\d+|master)$/',
$dstVersion, $m ) ) {
$dstVersionNum = $m[1]; // everything after 'php-'
$argsValid = true;
@@ -32,7 +32,7 @@
}
if ( !$argsValid ) {
- die( "Usage: checkoutMediaWiki X.XXwmfX php-X.XX\n" );
+ die( "Usage: checkoutMediaWiki X.XXwmfX php-X.XXwmfX\n" );
}
# MW install path
Modified: trunk/tools/mwmultiversion/multiversion/deleteMediaWiki
===================================================================
--- trunk/tools/mwmultiversion/multiversion/deleteMediaWiki 2012-04-18
17:31:23 UTC (rev 114955)
+++ trunk/tools/mwmultiversion/multiversion/deleteMediaWiki 2012-04-18
17:32:48 UTC (rev 114956)
@@ -15,15 +15,15 @@
$argsValid = false;
if ( count( $argv ) >= 2 ) {
- $dstVersion = $argv[1]; // e.g. "php-X.XX"
- if ( preg_match( '/^php-((?:\d+\.\d+|trunk)(?:-\w+)?)$/',
$dstVersion, $m ) ) {
+ $dstVersion = $argv[1]; // e.g. "php-X.XXwmfX"
+ if ( preg_match(
'/^php-((?:\d+\.\d+wmf\d+|master)(?:-\w+)?)$/', $dstVersion, $m ) ) {
$dstVersionNum = $m[1]; // everything after 'php-'
$argsValid = true;
}
}
if ( !$argsValid ) {
- die( "Usage: deleteMediaWiki php-X.XX\n" );
+ die( "Usage: deleteMediaWiki php-X.XXwmfX\n" );
}
# MW install path
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
