https://www.mediawiki.org/wiki/Special:Code/MediaWiki/103507

Revision: 103507
Author:   reedy
Date:     2011-11-17 20:39:40 +0000 (Thu, 17 Nov 2011)
Log Message:
-----------
Don't attempt to diff zips or xmp files

Modified Paths:
--------------
    trunk/tools/make-release/make-release

Modified: trunk/tools/make-release/make-release
===================================================================
--- trunk/tools/make-release/make-release       2011-11-17 20:35:20 UTC (rev 
103506)
+++ trunk/tools/make-release/make-release       2011-11-17 20:39:40 UTC (rev 
103507)
@@ -174,15 +174,14 @@
                dir2 += '/languages/messages'
        else:
                print "Generating normal patch file..."
-               excludedExtensions = ['messages', '*.png', '*.jpg', '*.xcf', 
'*.gif', '*.svg', '*.tiff']
+               excludedExtensions = ['messages', '*.png', '*.jpg', '*.xcf', 
'*.gif', '*.svg', '*.tiff', '*.zip', '*.xmp']
                for ext in excludedExtensions:
                        args.extend(['-x', ext])
 
        args.extend([dir1, dir2])
        print ' '.join(args)
        diffProc = subprocess.Popen(args, stdout = subprocess.PIPE)
-       gzipProc = subprocess.Popen(['gzip', '-9'],
-               stdin = diffProc.stdout, stdout = patchFile)
+       gzipProc = subprocess.Popen(['gzip', '-9'], stdin = diffProc.stdout, 
stdout = patchFile)
 
        diffStatus = diffProc.wait()
 
@@ -270,7 +269,7 @@
        # TODO: Change RELEASE-NOTES to use 
http://www.mediawiki.org/wiki/Release_notes/
        print
        print "Full release notes:"
-       print 
'http://svn.wikimedia.org/svnroot/mediawiki/'+branch+'/phase3/RELEASE-NOTES'
+       print 'http://svn.wikimedia.org/svnroot/mediawiki/' +branch+ 
'/phase3/RELEASE-NOTES'
        print
        print
        print 
'**********************************************************************'


_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

Reply via email to