r99565 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r99564‎ | r99565 | r99566 >
Date:20:50, 11 October 2011
Author:aaron
Status:deferred
Tags:
Comment:
Fixed mw-chksum-list "path/expression" error using Asher's fix (hardy backport)
Modified paths:
  • /branches/hardy/debs/wikimedia-task-appserver/debian/changelog (modified) (history)
  • /branches/hardy/debs/wikimedia-task-appserver/mw-cksum-list (modified) (history)

Diff [purge]

Index: branches/hardy/debs/wikimedia-task-appserver/debian/changelog
@@ -1,3 +1,9 @@
 2+wikimedia-task-appserver (1.52) hardy-wikimedia; urgency=low
 3+
 4+ * Fix for mw-cksum-list (thanks to Asher)
 5+
 6+ -- Aaron Schulz <aschulz@wikimedia.org> Tue, 11 Oct 2011 20:44:33 +0000
 7+
28 wikimedia-task-appserver (1.51) hardy-wikimedia; urgency=low
39
410 * Added scripts to create MediaWiki fingerprints. Used for checking if installations are synced.
Index: branches/hardy/debs/wikimedia-task-appserver/mw-cksum-list
@@ -12,15 +12,15 @@
1313 # Used for 'common-files' parameter in mw-cksum.
1414 if [ $(basename $1) == 'common-files' ]; then
1515 codePath=$(dirname $1)
16 - maxDepth="-maxdepth 1"
17 - filterParams="-name *.dat"
 16+ filterParams="-maxdepth 1 -type f"
1817 else
1918 codePath="$1"
20 - maxDepth=""
21 - filterParams="( -name *.php -o -name *.cdb ) ! -wholename */languages/messages/* ! -name *.i18n.php ! -name *.alias.php"
 19+ filterParams="-type f \( -name '*.php' -o -name '*.cdb' \) \
 20+ ! -wholename '*/languages/messages/*' ! -name '*.i18n.php' ! -name '*.alias.php' "
2221 fi
2322
2423 # Format through AWK to have the path first to improve diffs.
25 -nice -19 find -P $codePath $maxDepth -type f $filterParams \
26 - -exec stat --printf="%n %a %G %U " {} \; -exec cksum {} \; \
 24+eval nice -19 find -P "$codePath $filterParams \
 25+ -exec /usr/bin/stat --printf=\"%n %a %G %U \" {} \; -exec /usr/bin/cksum {} \;" \
2726 | awk '{print $1, $2, $3, $4, $5}' | sort;
 27+

Status & tagging log