# 
# 
# patch "ChangeLog"
#  from [433d30e96ae5de0e4f1134d94a6bdae3ca66a512]
#    to [98a19c78fc79c05644fcf3d868600397997533b3]
# 
# patch "testsuite.at"
#  from [c955055c30725c6d3510bcb9430ec3a5177ed963]
#    to [1256e25bb2800270d29e8edd597e6b9d081119d3]
# 
============================================================
--- ChangeLog	433d30e96ae5de0e4f1134d94a6bdae3ca66a512
+++ ChangeLog	98a19c78fc79c05644fcf3d868600397997533b3
@@ -1,5 +1,9 @@
 2006-03-12  Matthew Gregan  <address@hidden>
 
+	* testsuite.at: Changes to Perl and Python UNB64_COMMAND
+	invocations to work around some quoting issues broken/revealed in
+	my last change.
+
 	* paths.cc, annotate.cc, xdelta.cc: Fix the signed vs unsigned
 	warnings which have obvious solutions.
 
============================================================
--- testsuite.at	c955055c30725c6d3510bcb9430ec3a5177ed963
+++ testsuite.at	1256e25bb2800270d29e8edd597e6b9d081119d3
@@ -271,9 +271,13 @@
 elif test -n "`command -v recode`" 2>/dev/null; then
   UNB64_COMMAND="recode /Base64"
 elif perl -MMIME::Base64 -e 1 2>/dev/null; then
-  UNB64_COMMAND="perl -MMIME::Base64 -ne 'print decode_base64(\$_)'"
+  AT_DATA(unbase64.pl, [print decode_base64($_)
+])
+  UNB64_COMMAND="perl -MMIME::Base64 -n unbase64.pl"
 elif python -c 'import sys;sys.exit(not hasattr("", "decode"))' 2>/dev/null; then
-  UNB64_COMMAND="python -c 'import sys;sys.stdout.write(sys.stdin.read().decode("'"'"base64"'"'"))'"
+  AT_DATA(unbase64.py, [import sys;sys.stdout.write(sys.stdin.read().decode('base64'))
+])
+  UNB64_COMMAND="python unbase64.py"
 else
   # This is lame!  We should XFAIL the test so the user knows that
   # they're not, you know, actually testing the software.  But