aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog2
-rwxr-xr-xt/bazaar.t8
2 files changed, 10 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 53cff2970..df74e35d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,8 @@ ikiwiki (3.20100816) UNRELEASED; urgency=low
(intrigeri:)
* po: Fix some bugs that affected l10n.ikiwiki.info's unusual
setup. (intrigeri)
+ * t/bazaar.t: Work around bzr 2.2.0's new requirement to configure
+ bzr whoami before committing.
-- Joey Hess <joeyh@debian.org> Sun, 15 Aug 2010 11:45:48 -0400
diff --git a/t/bazaar.t b/t/bazaar.t
index cd840fbe1..6e58f48f1 100755
--- a/t/bazaar.t
+++ b/t/bazaar.t
@@ -25,6 +25,14 @@ $config{srcdir} = "$dir/repo";
IkiWiki::loadplugins();
IkiWiki::checkconfig();
+# XXX
+# This is a workaround for bzr's new requirement that bzr whoami be run
+# before committing. This makes the test suite work with an unconfigured
+# bzr, but ignores the need to have a properly configured bzr before
+# using ikiwiki with bzr.
+$ENV{HOME}=$dir;
+system 'bzr whoami test@example.com';
+
system "bzr init $config{srcdir}";
use CGI::Session;