diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-11-02 16:37:28 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-11-02 16:37:28 -0400 |
| commit | aaf881e8bb22408f671e566ebcd3f59be958a26f (patch) | |
| tree | b8d8a53dfdfb7a94f109f4f84355f17d936cc122 | |
| parent | 876cf160a323e26878e518d0496a6a15a30513ee (diff) | |
gcrypt, bup: Fix bug that prevented using these special remotes with encryption=pubkey.
I think both of these are all that's affected, but I went ahead and fixed
all the remotes that set their config to M.empty to instead store the
actual config. Who knows what will expect it to be actually present in
future, the Remote instance of getGpgEncParams came to..
| -rw-r--r-- | Remote/Directory.hs | 2 | ||||
| -rw-r--r-- | Remote/Git.hs | 2 | ||||
| -rw-r--r-- | Remote/Hook.hs | 2 | ||||
| -rw-r--r-- | Remote/Rsync.hs | 2 | ||||
| -rw-r--r-- | Remote/Web.hs | 2 | ||||
| -rw-r--r-- | debian/changelog | 2 |
6 files changed, 7 insertions, 5 deletions
diff --git a/Remote/Directory.hs b/Remote/Directory.hs index 16535070e..e6deee4bf 100644 --- a/Remote/Directory.hs +++ b/Remote/Directory.hs @@ -56,7 +56,7 @@ gen r u c gc = do whereisKey = Nothing, remoteFsck = Nothing, repairRepo = Nothing, - config = M.empty, + config = c, repo = r, gitconfig = gc, localpath = Just dir, diff --git a/Remote/Git.hs b/Remote/Git.hs index ba247078b..d4e5987dc 100644 --- a/Remote/Git.hs +++ b/Remote/Git.hs @@ -120,7 +120,7 @@ gen r u c gc , repairRepo = if Git.repoIsUrl r then Nothing else Just $ repairRemote r - , config = M.empty + , config = c , localpath = localpathCalc r , repo = r , gitconfig = gc diff --git a/Remote/Hook.hs b/Remote/Hook.hs index fdb24d0cb..55ff78514 100644 --- a/Remote/Hook.hs +++ b/Remote/Hook.hs @@ -54,7 +54,7 @@ gen r u c gc = do whereisKey = Nothing, remoteFsck = Nothing, repairRepo = Nothing, - config = M.empty, + config = c, localpath = Nothing, repo = r, gitconfig = gc, diff --git a/Remote/Rsync.hs b/Remote/Rsync.hs index 6bc5fd78f..91638de98 100644 --- a/Remote/Rsync.hs +++ b/Remote/Rsync.hs @@ -81,7 +81,7 @@ gen r u c gc = do , whereisKey = Nothing , remoteFsck = Nothing , repairRepo = Nothing - , config = M.empty + , config = c , repo = r , gitconfig = gc , localpath = if islocal diff --git a/Remote/Web.hs b/Remote/Web.hs index 7c98dbf40..9af80a776 100644 --- a/Remote/Web.hs +++ b/Remote/Web.hs @@ -58,7 +58,7 @@ gen r _ _ gc = whereisKey = Just getUrls, remoteFsck = Nothing, repairRepo = Nothing, - config = M.empty, + config = c, gitconfig = gc, localpath = Nothing, repo = r, diff --git a/debian/changelog b/debian/changelog index 3f37a4d37..927b2e00b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ git-annex (4.20131102) UNRELEASED; urgency=low the pairing process separately. * sync: Work even when the local git repository is new and empty, with no master branch. + * gcrypt, bup: Fix bug that prevented using these special remotes + with encryption=pubkey. -- Joey Hess <joeyh@debian.org> Sat, 02 Nov 2013 14:54:36 -0400 |