git-workflow/autogits
SHA256
19
0
Fork 8
Code Issues 43 Pull Requests 6 Projects 2 Activity

status: fix xml output

Browse Source
This commit is contained in:
Adam Majer
2025-10-15 18:09:21 +02:00
parent 23a7f310c5
commit 19902813b5
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
common/obs_utils.go
View File

@@ -600,15 +600,16 @@ func PackageBuildStatusComp(A, B *PackageBuildStatus) int {
} }
type BuildResult struct { type BuildResult struct {
XMLName xml.Name `xml:"result"`
Project string `xml:"project,attr"` Project string `xml:"project,attr"`
Repository string `xml:"repository,attr"` Repository string `xml:"repository,attr"`
Arch string `xml:"arch,attr"` Arch string `xml:"arch,attr"`
Code string `xml:"code,attr"` Code string `xml:"code,attr"`
Dirty bool `xml:"dirty,attr"` Dirty bool `xml:"dirty,attr,omitempty"`
ScmSync string `xml:"scmsync"` ScmSync string `xml:"scmsync,omitempty"`
ScmInfo string `xml:"scminfo"` ScmInfo string `xml:"scminfo,omitempty"`
Status []*PackageBuildStatus `xml:"status"` Status []*PackageBuildStatus `xml:"status"`
Binaries []BinaryList `xml:"binarylist"` Binaries []BinaryList `xml:"binarylist,omitempty"`
LastUpdate time.Time LastUpdate time.Time
} }
@@ -635,8 +636,8 @@ type BinaryList struct {
} }
type BuildResultList struct { type BuildResultList struct {
XMLName xml.Name `xml:"resultlist"` XMLName xml.Name `xml:"resultlist"`
State string `xml:"state,attr"` State string `xml:"state,attr"`
Result []*BuildResult `xml:"result"` Result []*BuildResult `xml:"result"`
isLastBuild bool isLastBuild bool

2
obs-status-service/main.go
View File

@@ -211,7 +211,9 @@ func WriteXml(data any, res http.ResponseWriter) {
res.WriteHeader(500) res.WriteHeader(500)
} else { } else {
res.Header().Add("size", fmt.Sprint(len(xmlData))) res.Header().Add("size", fmt.Sprint(len(xmlData)))
res.Write([]byte("<resultlist>"))
res.Write(xmlData) res.Write(xmlData)
res.Write([]byte("</resultlist>"))
} }
} }