Pārlūkot izejas kodu

do not parse url from configured host

now that the scheme is not required in the configuration file, we can
assume the configured value is correct. as with other uses, the
configured value is only used when noth host and user are present.
pull/36/head
Rob Loranger pirms 4 gadiem
vecāks
revīzija
8625e42ce7
Šim parakstam datu bāzē netika atrasta zināma atslēga GPG atslēgas ID: D6F1633A4F0903B8
1 mainītis faili ar 4 papildinājumiem un 5 dzēšanām
  1. +4
    -5
      config/options.go

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

@@ -1,7 +1,6 @@
package config

import (
"net/url"
"strings"

"github.com/cloudfoundry/jibber_jabber"
@@ -99,9 +98,9 @@ func HostDirectory(c *cli.Context) (string, error) {
return hostFlag, nil
}

u, err := url.Parse(cfg.Default.Host)
if err != nil {
return "", err
if cfg.Default.Host != "" && cfg.Default.User != "" {
return cfg.Default.Host, nil
}
return u.Hostname(), nil

return "", nil
}

Notiek ielāde…
Atcelt
Saglabāt