From 4a20397ed093cb4308e25c1a46ecce69bc0ffbc4 Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Fri, 10 Oct 2025 20:21:45 -0500 Subject: test one .deb file --- doIncoming.go | 5 +++-- doMakeDists.go | 8 ++++++++ doWalk.go | 8 +------- main.go | 2 +- 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/doIncoming.go b/doIncoming.go index 1859d86..a977cb3 100644 --- a/doIncoming.go +++ b/doIncoming.go @@ -8,10 +8,11 @@ import ( "go.wit.com/lib/config" "go.wit.com/lib/gui/shell" + "go.wit.com/lib/protobuf/zoopb" "go.wit.com/log" ) -func doIncoming() (string, error) { +func doIncoming(pb *zoopb.Packages) (string, error) { os.Chdir(me.mirrorsDir) var counter int @@ -81,6 +82,6 @@ func doIncoming() (string, error) { return nil }) - s := log.Sprintf("scaned %d files. (%d) in incoming. (%d) new files", counter, incount, newcount) + s := log.Sprintf("scanned %d files. (%d) in incoming. (%d) new files pb.Len(%d)", counter, incount, newcount, pb.Len()) return s, err } diff --git a/doMakeDists.go b/doMakeDists.go index 822b38c..b4d537f 100644 --- a/doMakeDists.go +++ b/doMakeDists.go @@ -1,6 +1,8 @@ package main import ( + "os" + "go.wit.com/log" ) @@ -12,6 +14,12 @@ func doMakeDists(mirrorshome string) (string, error) { me.pb.BaseDir = mirrorshome } + os.Chdir(me.pb.BaseDir) + + for p := range me.pb.IterAll() { + p.Print() + return "printed one out", nil + } s, err := me.pb.MakeDists() return s, err } diff --git a/doWalk.go b/doWalk.go index f2ad84a..7df92e9 100644 --- a/doWalk.go +++ b/doWalk.go @@ -2,14 +2,11 @@ package main import ( "os" - "strings" "time" "go.wit.com/lib/debian" - "go.wit.com/lib/gui/shell" "go.wit.com/lib/protobuf/zoopb" "go.wit.com/log" - "google.golang.org/protobuf/encoding/prototext" "google.golang.org/protobuf/types/known/timestamppb" ) @@ -84,10 +81,7 @@ func doWalk() (string, error) { panic("newdeb.Filename = ''") } if argv.Verbose { - shell.RunVerbose([]string{"dpkg", "-I", newdeb.Filename}) - log.Info("\nNEW PB START") - log.Info(strings.TrimSpace(prototext.Format(newdeb))) - log.Info("NEW PB END\n") + newdeb.Print() } // arch := deb.ControlData["Architecture"] } diff --git a/main.go b/main.go index 88a75f1..066d374 100644 --- a/main.go +++ b/main.go @@ -46,7 +46,7 @@ func main() { var s string var err error if argv.Incoming != nil { - s, err = doIncoming() + s, err = doIncoming(me.pb) } if argv.Walk != nil { -- cgit v1.2.3