Quellcode durchsuchen

CurrentUser only use global when needed

by needed: when host flag was supplied, matches that configured and a
user is set in config as well. they should be a pair.
pull/36/head
Rob Loranger vor 4 Jahren
Ursprung
Commit
55dcf5e79c
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden GPG-Schlüssel-ID: D6F1633A4F0903B8
1 geänderte Dateien mit 8 neuen und 1 gelöschten Zeilen
  1. +8
    -1
      config/user.go

+ 8
- 1
config/user.go Datei anzeigen

@@ -147,10 +147,17 @@ func CurrentUser(c *cli.Context) (string, error) {
} }
if cfg.Default.User == "" { if cfg.Default.User == "" {
// Load app-level config // Load app-level config
cfg, err = LoadConfig(UserDataDir(c.App.ExtraInfo()["configDir"]))
globalCFG, err := LoadConfig(UserDataDir(c.App.ExtraInfo()["configDir"]))
if err != nil { if err != nil {
return "", err return "", err
} }
// only user global defaults when both are set and hosts match
if globalCFG.Default.User != "" &&
globalCFG.Default.Host != "" &&
c.GlobalIsSet("host") &&
globalCFG.Default.Host == c.GlobalString("host") {
cfg = globalCFG
}
} }


// Use user flag value // Use user flag value


Laden…
Abbrechen
Speichern