summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-09-11 12:07:59 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-09-11 12:07:59 -0400
commitd71636fba46d42cd6d86fd175e635a8539616bca (patch)
tree069093fd2a1630d6b1371e43d176e1183dbaf4f0
parentd1f2693f5da44325a76c4fe46ec0dc88e966c8b1 (diff)
Fix problem with test suite in non-unicode locale.
-rw-r--r--Types/Key.hs2
-rw-r--r--debian/changelog6
2 files changed, 7 insertions, 1 deletions
diff --git a/Types/Key.hs b/Types/Key.hs
index a0c6d83bc..e8b775fd7 100644
--- a/Types/Key.hs
+++ b/Types/Key.hs
@@ -81,7 +81,7 @@ file2key s = if key == Just stubKey then Nothing else key
instance Arbitrary Key where
arbitrary = Key
- <$> arbitrary
+ <$> (listOf1 $ elements $ ['A'..'Z'] ++ ['a'..'z'] ++ ['0'..'9'] ++ "\r\n \t")
<*> (listOf1 $ elements ['A'..'Z']) -- BACKEND
<*> ((abs <$>) <$> arbitrary) -- size cannot be negative
<*> arbitrary
diff --git a/debian/changelog b/debian/changelog
index c87d347c1..d0fe10b1b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+git-annex (4.20130910) UNRELEASED; urgency=low
+
+ * Fix problem with test suite in non-unicode locale.
+
+ -- Joey Hess <joeyh@debian.org> Wed, 11 Sep 2013 12:07:28 -0400
+
git-annex (4.20130909) unstable; urgency=low
* initremote: Syntax change when setting up an encrypted special remote.