diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-05-30 14:30:43 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-05-30 14:30:43 -0400 |
| commit | 15284e1696e9c881a1824ea3be45c65a92369e05 (patch) | |
| tree | 223e6a6bcca8115e9792b907909b48645ad90d3d | |
| parent | a102f2f1887f2565b3a7908eff8995e6cf04d567 (diff) | |
avoid stomping on existing description when enabling a special remote
Happened with eg, gcrypt remotes.
| -rw-r--r-- | Assistant/MakeRemote.hs | 3 | ||||
| -rw-r--r-- | debian/changelog | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/Assistant/MakeRemote.hs b/Assistant/MakeRemote.hs index 349d4af9c..41be3275c 100644 --- a/Assistant/MakeRemote.hs +++ b/Assistant/MakeRemote.hs @@ -100,7 +100,8 @@ setupSpecialRemote name remotetype config mcreds (mu, c) = do - to perform IO actions to refill the pool. -} (c', u) <- R.setup remotetype mu mcreds $ M.insert "highRandomQuality" "false" $ M.union config c - describeUUID u name + whenM (isNothing . M.lookup u <$> uuidMap) $ + describeUUID u name configSet u c' return name diff --git a/debian/changelog b/debian/changelog index 6765dd3dc..d8bc867d0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,8 +3,9 @@ git-annex (5.20140530) UNRELEASED; urgency=medium * webapp: When adding a new local repository, fix bug that caused its group and preferred content to be set in the current repository, even when not combining. - * webapp: Avoid stomping on existing group and preferred content settings - when enabling or combining with an already existing remote. + * webapp: Avoid stomping on existing description, group and + preferred content settings when enabling or combining with + an already existing remote. -- Joey Hess <joeyh@debian.org> Thu, 29 May 2014 20:10:59 -0400 |