https://www.mediawiki.org/wiki/Special:Code/MediaWiki/114846
Revision: 114846
Author: reedy
Date: 2012-04-11 16:20:05 +0000 (Wed, 11 Apr 2012)
Log Message:
-----------
Don't try and checkout a tag if we're doing a trunk snapshot
Remove a couple of debugging lines
Modified Paths:
--------------
trunk/tools/make-release/make-release
Modified: trunk/tools/make-release/make-release
===================================================================
--- trunk/tools/make-release/make-release 2012-04-11 15:53:54 UTC (rev
114845)
+++ trunk/tools/make-release/make-release 2012-04-11 16:20:05 UTC (rev
114846)
@@ -155,14 +155,16 @@
print "git clone failed, exiting"
sys.exit(1)
- print "Checking out %s..." % (tag)
os.chdir(dir)
- proc = subprocess.Popen(['git', 'checkout', tag])
-
- if proc.wait() != 0:
- print "git checkout failed, exiting"
- sys.exit(1)
+ if tag != 'trunk':
+ print "Checking out %s..." % (tag)
+ proc = subprocess.Popen(['git', 'checkout', tag])
+
+ if proc.wait() != 0:
+ print "git checkout failed, exiting"
+ sys.exit(1)
+
subprocess.Popen(['rm', '-rf', '.git' ])
os.chdir('..')
print "Done"
@@ -219,8 +221,6 @@
package = 'mediawiki-' + version
- #print version, branch, dir, prevVersion, prevBranch
- #sys.exit(0)
# Export the target
export(branch, package)
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
