Pārlūkot izejas kodu

CurrentUser should always return the flag if set

previously when the user flag was provided, the function would still try
to get a user from config. flag should take precedence
pull/36/head
Rob Loranger pirms 4 gadiem
vecāks
revīzija
abc78c7652
Šim parakstam datu bāzē netika atrasta zināma atslēga GPG atslēgas ID: D6F1633A4F0903B8
1 mainītis faili ar 5 papildinājumiem un 5 dzēšanām
  1. +5
    -5
      config/user.go

+ 5
- 5
config/user.go Parādīt failu

@@ -136,6 +136,11 @@ func UserHostDir(c *cli.Context) (string, error) {
// CurrentUser returns the username of the user taking action in the current
// cli.Context.
func CurrentUser(c *cli.Context) (string, error) {
// Use user flag value
if c.GlobalString("user") != "" {
return c.GlobalString("user"), nil
}

// Load host-level config, if host flag is set
hostDir, err := UserHostDir(c)
if err != nil {
@@ -160,10 +165,5 @@ func CurrentUser(c *cli.Context) (string, error) {
}
}

// Use user flag value
if c.GlobalString("user") != "" {
return c.GlobalString("user"), nil
}

return cfg.Default.User, nil
}

Notiek ielāde…
Atcelt
Saglabāt