aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSeb Bacon <seb.bacon@gmail.com>2012-01-17 10:59:55 +0000
committerSeb Bacon <seb.bacon@gmail.com>2012-01-17 10:59:55 +0000
commita714a0b2761f0c88665eee3088fd3127e0bb5e05 (patch)
treea10a395576db680a6fcb96cd1aa9ed5b28cc425e
parent9099f63a364242764da529c109166e69fd2ec606 (diff)
parentbae21e38242aac2c5843bae5ea5fe3b09408a4f9 (diff)
Merge branch 'release/0.5' of github.com:sebbacon/alaveteli into release/0.5
-rw-r--r--vendor/plugins/acts_as_xapian/lib/acts_as_xapian.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/vendor/plugins/acts_as_xapian/lib/acts_as_xapian.rb b/vendor/plugins/acts_as_xapian/lib/acts_as_xapian.rb
index 25347e0db..45e412e0e 100644
--- a/vendor/plugins/acts_as_xapian/lib/acts_as_xapian.rb
+++ b/vendor/plugins/acts_as_xapian/lib/acts_as_xapian.rb
@@ -293,7 +293,7 @@ module ActsAsXapian
if e.message =~ /DatabaseModifiedError: /
# This should be a transient error, so back off and try again, up to a point
if tries > MSET_MAX_TRIES
- raise "Received DatabaseModifiedError from Xapian even after retrying #{MAX_TRIES} times"
+ raise "Received DatabaseModifiedError from Xapian even after retrying #{MSET_MAX_TRIES} times"
else
sleep delay
end