avoid stomping on existing description when enabling a special remote
Happened with eg, gcrypt remotes.
This commit is contained in:
parent
86b9ae15dd
commit
c92d43fb7b
2 changed files with 5 additions and 3 deletions
|
@ -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
|
||||
|
||||
|
|
5
debian/changelog
vendored
5
debian/changelog
vendored
|
@ -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
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue