From d7b330b33bcfa57164dad05b0fc9990ad4a35275 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 28 Apr 2011 14:39:51 -0400 Subject: [PATCH] Fix hasKeyCheap setting for bup and rsync special remotes. --- Remote/Bup.hs | 2 +- Remote/Rsync.hs | 2 +- debian/changelog | 6 ++++++ doc/news/version_0.20110401.mdwn | 11 ----------- doc/news/version_0.20110427.mdwn | 8 ++++++++ 5 files changed, 16 insertions(+), 13 deletions(-) delete mode 100644 doc/news/version_0.20110401.mdwn create mode 100644 doc/news/version_0.20110427.mdwn diff --git a/Remote/Bup.hs b/Remote/Bup.hs index 6ae002c3b9..0aaff06b25 100644 --- a/Remote/Bup.hs +++ b/Remote/Bup.hs @@ -61,7 +61,7 @@ gen r u c = do retrieveKeyFile = retrieve buprepo, removeKey = remove, hasKey = checkPresent r bupr', - hasKeyCheap = True, + hasKeyCheap = bupLocal buprepo, config = c } diff --git a/Remote/Rsync.hs b/Remote/Rsync.hs index 21c570a87c..682c961748 100644 --- a/Remote/Rsync.hs +++ b/Remote/Rsync.hs @@ -61,7 +61,7 @@ gen r u c = do retrieveKeyFile = retrieve o, removeKey = remove o, hasKey = checkPresent r o, - hasKeyCheap = True, + hasKeyCheap = False, config = Nothing } diff --git a/debian/changelog b/debian/changelog index cb3913470e..870a45820e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +git-annex (0.20110428) UNRELEASED; urgency=low + + * Fix hasKeyCheap setting for bup and rsync special remotes. + + -- Joey Hess Thu, 28 Apr 2011 14:38:16 -0400 + git-annex (0.20110427) unstable; urgency=low * Switch back to haskell SHA library, so git-annex remains buildable on diff --git a/doc/news/version_0.20110401.mdwn b/doc/news/version_0.20110401.mdwn deleted file mode 100644 index 7c9ca6f5ca..0000000000 --- a/doc/news/version_0.20110401.mdwn +++ /dev/null @@ -1,11 +0,0 @@ -git-annex 0.20110401 released with [[!toggle text="these changes"]] -[[!toggleable text=""" - * Amazon S3 is now supported as a special type of remote. - Warning: Encrypting data before sending it to S3 is not yet supported. - * Note that Amazon S3 support is not built in by default on Debian yet, - as hS3 is not packaged. - * fsck: Ensure that files and directories in .git/annex/objects - have proper permissions. - * Added a special type of remote called a directory remote, which - simply stores files in an arbitrary local directory. - * Bugfix: copy --to --fast never really copied, fixed."""]] \ No newline at end of file diff --git a/doc/news/version_0.20110427.mdwn b/doc/news/version_0.20110427.mdwn new file mode 100644 index 0000000000..2764c6de56 --- /dev/null +++ b/doc/news/version_0.20110427.mdwn @@ -0,0 +1,8 @@ +git-annex 0.20110427 released with [[!toggle text="these changes"]] +[[!toggleable text=""" + * Switch back to haskell SHA library, so git-annex remains buildable on + Debian stable. + * Added rsync special remotes. This could be used, for example, to + store annexed content on rsync.net (encrypted naturally). Or anywhere else. + * Bugfix: Avoid pipeline stall when running git annex drop or fsck on a + lot of files. Possibly only occured with ghc 7."""]] \ No newline at end of file