http://www.mediawiki.org/wiki/Special:Code/MediaWiki/99563
Revision: 99563
Author: aaron
Date: 2011-10-11 20:49:46 +0000 (Tue, 11 Oct 2011)
Log Message:
-----------
Fixed mw-chksum-list "path/expression" error using Asher's fix
Modified Paths:
--------------
trunk/debs/wikimedia-task-appserver/debian/changelog
trunk/debs/wikimedia-task-appserver/mw-cksum-list
Modified: trunk/debs/wikimedia-task-appserver/debian/changelog
===================================================================
--- trunk/debs/wikimedia-task-appserver/debian/changelog 2011-10-11
20:49:28 UTC (rev 99562)
+++ trunk/debs/wikimedia-task-appserver/debian/changelog 2011-10-11
20:49:46 UTC (rev 99563)
@@ -1,3 +1,9 @@
+wikimedia-task-appserver (2.3-4) hardy-wikimedia; urgency=low
+
+ * Fix for mw-cksum-list (thanks to Asher)
+
+ -- Aaron Schulz <asch...@wikimedia.org> Tue, 11 Oct 2011 20:44:33 +0000
+
wikimedia-task-appserver (2.3-3) lucid-wikimedia; urgency=low
* Added scripts to create MediaWiki fingerprints. Used for checking if
installations are synced.
Modified: trunk/debs/wikimedia-task-appserver/mw-cksum-list
===================================================================
--- trunk/debs/wikimedia-task-appserver/mw-cksum-list 2011-10-11 20:49:28 UTC
(rev 99562)
+++ trunk/debs/wikimedia-task-appserver/mw-cksum-list 2011-10-11 20:49:46 UTC
(rev 99563)
@@ -12,15 +12,15 @@
# Used for 'common-files' parameter in mw-cksum.
if [ $(basename $1) == 'common-files' ]; then
codePath=$(dirname $1)
- maxDepth="-maxdepth 1"
- filterParams="-name *.dat"
+ filterParams="-maxdepth 1 -type f"
else
codePath="$1"
- maxDepth=""
- filterParams="( -name *.php -o -name *.cdb ) ! -wholename
*/languages/messages/* ! -name *.i18n.php ! -name *.alias.php"
+ filterParams="-type f \( -name '*.php' -o -name '*.cdb' \) \
+ ! -wholename '*/languages/messages/*' ! -name '*.i18n.php' ! -name
'*.alias.php' "
fi
# Format through AWK to have the path first to improve diffs.
-nice -19 find -P $codePath $maxDepth -type f $filterParams \
- -exec stat --printf="%n %a %G %U " {} \; -exec cksum {} \; \
+eval nice -19 find -P "$codePath $filterParams \
+ -exec /usr/bin/stat --printf=\"%n %a %G %U \" {} \; -exec
/usr/bin/cksum {} \;" \
| awk '{print $1, $2, $3, $4, $5}' | sort;
+
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
