Browse Source

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 4 years ago
parent
commit
abc78c7652
No known key found for this signature in database GPG Key ID: D6F1633A4F0903B8
1 changed files with 5 additions and 5 deletions
  1. +5
    -5
      config/user.go

+ 5
- 5
config/user.go View File

@@ -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
}

Loading…
Cancel
Save