diff options
| -rw-r--r-- | http.go | 2 | ||||
| -rw-r--r-- | humanTable.go | 6 | ||||
| -rw-r--r-- | init.go | 1 | ||||
| -rw-r--r-- | patchset.Get.go | 9 |
4 files changed, 16 insertions, 2 deletions
@@ -21,7 +21,7 @@ func (f *Forge) HttpPost(url string, data []byte) ([]byte, error) { usr, _ := user.Current() req.Header.Set("author", usr.Username) - req.Header.Set("hostname", "fixme:hostname") + req.Header.Set("hostname", f.hostname) client := &http.Client{} resp, err := client.Do(req) diff --git a/humanTable.go b/humanTable.go index d70baf1..2b25728 100644 --- a/humanTable.go +++ b/humanTable.go @@ -342,7 +342,11 @@ func (psets *Patchsets) PrintTable() { var countCONTENTS int var countPARTS int for x, pset := range psets.GetPatchsets() { - log.Info(pset.Uuid, pset.Name) + log.Info(pset.Uuid, pset.Name, pset.State) + if pset.State == "DONE" { + // old patchset + continue + } cId := log.Sprintf("%d", x) countCONTENTS += 1 for i, p := range pset.Patches.GetPatches() { @@ -178,6 +178,7 @@ func (f *Forge) setenv() { f.repoPB = os.Getenv("FORGE_REPOPB") f.forgeURL = os.Getenv("FORGE_URL") f.patchDir = os.Getenv("FORGE_PATCHDIR") + f.hostname = os.Getenv("HOSTNAME") if os.Getenv("FORGE_GOWORK") == "true" { f.goWork = true } diff --git a/patchset.Get.go b/patchset.Get.go index 5570b87..c650a82 100644 --- a/patchset.Get.go +++ b/patchset.Get.go @@ -28,6 +28,14 @@ func (f *Forge) GetPatches() error { return nil } +func (f *Forge) expireAllPatchsets() { + all := f.Patchsets.All() + for all.Scan() { + pset := all.Next() + pset.State = "DONE" + } +} + func (f *Forge) loadUpstreamPatchsets(psets *Patchsets) { var foundnew bool @@ -36,6 +44,7 @@ func (f *Forge) loadUpstreamPatchsets(psets *Patchsets) { pset := all.Next() found := f.Patchsets.FindByUuid(pset.Uuid) if found == nil { + f.expireAllPatchsets() log.Info("new patchset", pset.Name, pset.Uuid) pset.State = "new" foundnew = true |