Kaynağa Gözat

added empty check for dependencies in the LDFLAGS

Michael Goldberger 9 yıl önce
ebeveyn
işleme
ced2369152
1 değiştirilmiş dosya ile 5 ekleme ve 0 silme
  1. 5 0
      psiphon/common/buildinfo.go

+ 5 - 0
psiphon/common/buildinfo.go

@@ -63,6 +63,7 @@ type BuildInfo struct {
 
 
 // Convert 'BuildInfo' struct to 'map[string]interface{}'
 // Convert 'BuildInfo' struct to 'map[string]interface{}'
 func (bi *BuildInfo) ToMap() *map[string]interface{} {
 func (bi *BuildInfo) ToMap() *map[string]interface{} {
+
 	var dependenciesMap map[string]interface{}
 	var dependenciesMap map[string]interface{}
 	json.Unmarshal([]byte(bi.Dependencies), &dependenciesMap)
 	json.Unmarshal([]byte(bi.Dependencies), &dependenciesMap)
 
 
@@ -79,6 +80,10 @@ func (bi *BuildInfo) ToMap() *map[string]interface{} {
 
 
 // Return an instance of the BuildInfo struct
 // Return an instance of the BuildInfo struct
 func GetBuildInfo() *BuildInfo {
 func GetBuildInfo() *BuildInfo {
+	if strings.TrimSpace(dependencies) == "" {
+		dependencies = "{}"
+	}
+
 	buildInfo := BuildInfo{
 	buildInfo := BuildInfo{
 		BuildDate:       strings.TrimSpace(buildDate),
 		BuildDate:       strings.TrimSpace(buildDate),
 		BuildRepo:       strings.TrimSpace(buildRepo),
 		BuildRepo:       strings.TrimSpace(buildRepo),