aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--LocationLog.hs2
-rw-r--r--debian/changelog3
2 files changed, 4 insertions, 1 deletions
diff --git a/LocationLog.hs b/LocationLog.hs
index 28b423e2f..aab817f3f 100644
--- a/LocationLog.hs
+++ b/LocationLog.hs
@@ -60,7 +60,7 @@ logFile key = hashDirLower key ++ keyFile key ++ ".log"
{- Converts a log filename into a key. -}
logFileKey :: FilePath -> Maybe Key
logFileKey file
- | end == ".log" = readKey beginning
+ | end == ".log" = fileKey beginning
| otherwise = Nothing
where
(beginning, end) = splitAt (length file - 4) file
diff --git a/debian/changelog b/debian/changelog
index 8d1a396cb..ef0ec7719 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
git-annex (3.20110706) UNRELEASED; urgency=low
* Fix sign bug in disk free space checking.
+ * Bugfix: Forgot to de-escape keys when upgrading. Could result in
+ bad location log data for keys that contain [&:%] in their names.
+ (A workaround for this problem is to run git annex fsck.)
-- Joey Hess <joeyh@debian.org> Tue, 05 Jul 2011 20:52:11 -0400