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

webapp: avoid overwriting remote configs when enabling it

Browse source 
Avoid stomping on existing group and preferred content settings
when enabling or combining with an already existing remote.

Two level fix. First, use defaultStandardGroup rather than
setStandardGroup, so if there is an existing configuration in the git-annex
branch, it's not overwritten.

To handle pre-existing ssh remotes (including gcrypt), a second level is
needed, because before syncing with the remote, it's configuration won't be
available locally. (And syncing could take a long time.) So, in this case,
keep track of whether the remote is being created or enabled, and only set
configs when creating it.

This commit was sponsored by Anders Lannerback.
This commit is contained in:
Joey Hess 2014-05-30 14:03:04 -04:00
parent 7089e282b5
commit 9eaabf0382
6 changed files with 52 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

3
debian/changelog vendored
View file

@ -4,8 +4,7 @@ git-annex (5.20140530) UNRELEASED; urgency=medium
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 adding a local repository (or removable drive repository) that
already exists.
when enabling or combining with an already existing remote.
-- Joey Hess <joeyh@debian.org> Thu, 29 May 2014 20:10:59 -0400