Fix substitution

This commit is contained in:
Neil Alexander 2018-05-23 18:53:44 +01:00
parent 1fd53bcb7d
commit 8456b2e1bc
No known key found for this signature in database
GPG Key ID: A02A2019A2BB0944

View File

@ -160,14 +160,14 @@ func main() {
"AllowedBoxPubs": "AllowedEncryptionPublicKeys",
}
for from, to := range changes {
if val, ok := dat[from]; ok {
if val == "" {
if _, ok := dat[from]; ok {
if to == "" {
if !*normaliseconf {
log.Println("Warning: Deprecated config option", from, " - please remove")
log.Println("Warning: Deprecated config option", from, "- please remove")
}
} else {
if !*normaliseconf {
log.Println("Warning: Deprecated config option", from, " - please rename to", to)
log.Println("Warning: Deprecated config option", from, "- please rename to", to)
}
if _, ok := dat[to]; !ok {
dat[to] = dat[from]