From 4fc958fcc9069211260d6b2ebf0b6ef9ce0398d6 Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Mon, 30 Dec 2024 00:50:51 -0600 Subject: [PATCH] trust nothing. but this might work. notsure it's hard to do distributed work when the tools are themselves being worked on. lots of crazy in these patches until they actually work. I'm switching between droplets, hypervisors, etc. --- Makefile | 4 ++-- applyPatch.go | 6 ++++-- send.go | 3 ++- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index a482324..c7d863c 100644 --- a/Makefile +++ b/Makefile @@ -67,8 +67,8 @@ all: install patches-make: install forge --patchset "from makefile 2" -localhost-patches: install - forge --patchset "test-localhost" --url "http://localhost:2233/" +patches-list-2233: install + forge --list-patchset --connect "http://go.wit.com:2233/" patches-list: install forge --list-patchset diff --git a/applyPatch.go b/applyPatch.go index 5c1ee12..0985345 100644 --- a/applyPatch.go +++ b/applyPatch.go @@ -12,8 +12,10 @@ import ( func applyPatches(pset *forgepb.Patchs) error { // log.Info("got to applyPatches() pset", pset) - log.Info("got to applyPatches() name", pset.Name) - log.Info("got to applyPatches() comment", pset.Comment) + log.Info("applyPatches() NAME", pset.Name) + log.Info("applyPatches() COMMENT", pset.Comment) + log.Info("applyPatches() GIT_AUTHOR_NAME", pset.GetGitAuthorName()) + log.Info("applyPatches() GIT_AUTHOR_EMAIL", pset.GetGitAuthorEmail()) all := pset.SortByFilename() for all.Scan() { p := all.Next() diff --git a/send.go b/send.go index a534d1a..650b78f 100644 --- a/send.go +++ b/send.go @@ -50,7 +50,8 @@ func listPatches() error { log.Info("patchset:", line) last = strings.TrimSpace(line) } - getPatch(last) + parts := strings.Fields(last) + getPatch(parts[0]) return nil }