mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

avoid stomping on existing description when enabling a special remote

Browse source 
Happened with eg, gcrypt remotes.
This commit is contained in:
Joey Hess 2014-05-30 14:30:43 -04:00
parent 86b9ae15dd
commit c92d43fb7b
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Assistant/MakeRemote.hs
View file

@ -100,7 +100,8 @@ setupSpecialRemote name remotetype config mcreds (mu, c) = do
- to perform IO actions to refill the pool. -} - to perform IO actions to refill the pool. -}
(c', u) <- R.setup remotetype mu mcreds $ (c', u) <- R.setup remotetype mu mcreds $
M.insert "highRandomQuality" "false" $ M.union config c M.insert "highRandomQuality" "false" $ M.union config c
describeUUID u name whenM (isNothing . M.lookup u <$> uuidMap) $
describeUUID u name
configSet u c' configSet u c'
return name return name

5
debian/changelog vendored
View file

@ -3,8 +3,9 @@ git-annex (5.20140530) UNRELEASED; urgency=medium
* webapp: When adding a new local repository, fix bug that caused its * webapp: When adding a new local repository, fix bug that caused its
group and preferred content to be set in the current repository, group and preferred content to be set in the current repository,
even when not combining. even when not combining.
* webapp: Avoid stomping on existing group and preferred content settings * webapp: Avoid stomping on existing description, group and
when enabling or combining with an already existing remote. 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 -- Joey Hess <joeyh@debian.org> Thu, 29 May 2014 20:10:59 -0400