瀏覽代碼

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 4 年之前
父節點
當前提交
8625e42ce7
沒有發現已知的金鑰在資料庫的簽署中 GPG 金鑰 ID: D6F1633A4F0903B8
共有 1 個檔案被更改,包括 4 行新增5 行删除
  1. +4
    -5
      config/options.go

+ 4
- 5
config/options.go 查看文件

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

Loading…
取消
儲存