diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-05-30 14:03:04 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-05-30 14:03:04 -0400 |
| commit | a102f2f1887f2565b3a7908eff8995e6cf04d567 (patch) | |
| tree | fa389876de1ed479cea38bbd65828fda31dd9728 /debian | |
| parent | 60330325aa7e38844ef02251e850936902cd084f (diff) | |
webapp: avoid overwriting remote configs when enabling it
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.
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 3eb4cf09d..6765dd3dc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 |