summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--doMake.go50
-rw-r--r--doMakeDists.go22
-rw-r--r--keyGetFromPackaagePB.go134
-rw-r--r--makePackagesFile.go95
4 files changed, 50 insertions, 251 deletions
diff --git a/doMake.go b/doMake.go
new file mode 100644
index 0000000..76ba16e
--- /dev/null
+++ b/doMake.go
@@ -0,0 +1,50 @@
+package main
+
+import (
+ "os"
+ "strings"
+
+ "go.wit.com/lib/debian"
+ "go.wit.com/lib/protobuf/zoopb"
+ "go.wit.com/log"
+)
+
+// os.Chdir(me.mirrorsDir)
+// makes the dists/ for 'apt update'
+func doMakeDists() (string, error) {
+ var s string
+ var err error
+ 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
+}
+
+// make a list of the newest .deb files
+func doMakePackagesFile(all *zoopb.Packages) string {
+ var pfile string
+ for p := range all.IterAll() {
+ var controlfile string
+ parts, err := zoopb.GetDebInfoFields(p)
+ if err != nil {
+ log.Info(err)
+ }
+ for _, varname := range parts {
+ varname, varval := debian.GetKeyFromPackagePB(p, varname)
+ varval = strings.TrimSpace(varval)
+ if varval == "" {
+ continue
+ }
+ controlfile += log.Sprintf("%s: %s\n", varname, varval)
+ }
+ controlfile += log.Sprintf("\n")
+ pfile += controlfile
+ }
+ return pfile
+}
diff --git a/doMakeDists.go b/doMakeDists.go
deleted file mode 100644
index 7967174..0000000
--- a/doMakeDists.go
+++ /dev/null
@@ -1,22 +0,0 @@
-package main
-
-import (
- "os"
-)
-
-// os.Chdir(me.mirrorsDir)
-// makes the dists/ for 'apt update'
-func doMakeDists() (string, error) {
- var s string
- var err error
- 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/keyGetFromPackaagePB.go b/keyGetFromPackaagePB.go
deleted file mode 100644
index a97e080..0000000
--- a/keyGetFromPackaagePB.go
+++ /dev/null
@@ -1,134 +0,0 @@
-package main
-
-import (
- "strings"
-
- "go.wit.com/lib/debian"
- "go.wit.com/lib/protobuf/zoopb"
- "go.wit.com/log"
-)
-
-// make a list of the newest .deb files
-func doMakePackagesFile(all *zoopb.Packages) string {
- var pfile string
- for p := range all.IterAll() {
- var controlfile string
- parts, err := zoopb.GetDebInfoFields(p)
- if err != nil {
- log.Info(err)
- }
- for _, varname := range parts {
- varname, varval := debian.GetKeyFromPackagePB(p, varname)
- varval = strings.TrimSpace(varval)
- if varval == "" {
- continue
- }
- controlfile += log.Sprintf("%s: %s\n", varname, varval)
- }
- controlfile += log.Sprintf("\n")
- pfile += controlfile
- }
- return pfile
-}
-
-/*
-func keyGetFromPackagePB(p *zoopb.Package, varname string) (string, string) {
- switch varname {
- case "Package":
- return "Package", p.Package
- case "Filename":
- return "Filename", p.Filename
- case "Version":
- return "Version", p.Version
- case "Architecture":
- return "Architecture", p.Architecture
- case "Maintainer":
- return "Maintainer", p.DebInfo.Maintainer
- // return "Maintainer", p.Author
- case "Source":
- if argv.Verbose {
- log.Info("skipping from controlfile", varname)
- // return "Source", p.DebInfo.Source
- }
- return "Source", ""
- case "Conflicts":
- return "Conflicts", p.DebInfo.Conflicts
- case "Packager":
- return "Packager", p.DebInfo.Packager
- // return "Packager", p.Packager
- case "Depends":
- return "Depends", p.DebInfo.Depends
- case "Namespace":
- return "Namespace", p.Namespace
- case "GitHash":
- return "Last-Git-Hash", p.DebInfo.GitHash
- case "GitDate":
- if p.DebInfo.GitDate == "" {
- return "Git-Hash-Date", ""
- }
- return "Git-Hash-Date", cobol.Time(p.DebInfo.GitDate)
- case "BuildDepends":
- return "Build-Depends", p.DebInfo.BuildDepends
- case "InstalledSize":
- return "Installed-Size", p.DebInfo.InstalledSize
- case "Homepage":
- return "Homepage", p.DebInfo.Homepage
- case "PreDepends":
- return "Pre-Depends", p.DebInfo.PreDepends
- case "Suggests":
- return "Suggests", p.DebInfo.Suggests
- case "MultiArch":
- return "Multi-Arch", p.DebInfo.MultiArch
- case "Tag":
- return "Tag", p.DebInfo.Tag
- case "Size":
- return "Size", p.DebInfo.Size
- case "Section":
- return "Section", p.DebInfo.Section
- case "URL":
- return "URL", p.DebInfo.URL
- //case "Size":
- // return "Size", p.DebInfo.Size
- case "BuildDate":
- if p.BuildDate == nil {
- return "Build-Date", ""
- }
- return "Build-Date", cobol.Time(p.BuildDate)
- case "DebCtime":
- return "Deb-File-Date", cobol.Time(p.Ctime)
- case "SHA1":
- return "SHA1", "" // deprecated
- // return "SHA1", p.DebInfo.SHA1
- case "MD5SUM":
- return "MD5Sum", p.DebInfo.MD5SUM
- case "SHA256":
- return "SHA256", p.DebInfo.SHA256
- case "SHA512":
- return "SHA512", "" // totally rediculously overkill
- case "Description":
- var out string
- lines := strings.Split(p.DebInfo.Description, "\n")
- if len(lines) == 0 {
- return "Description", out
- }
- out = "Description: " + strings.TrimSpace(lines[0])
- if len(lines) == 1 {
- return "Description", out
- }
- for _, line := range lines[1:] {
- out += " " + strings.TrimSpace(line)
- }
- return "Description", out
- default:
- dieMaking(varname)
- }
- return "", ""
-}
-
-func dieMaking(varname string) {
- log.Info("DebInfo sent a field we didn't have. fix the code above", varname)
- log.Printf("UNHANDLED ABOVE DEBINFO VAR: varname:%s\n", varname)
- // This forces me(it could be you!) to fix this parser
- panic("fix mirrors makeDebianControlFile()")
-}
-*/
diff --git a/makePackagesFile.go b/makePackagesFile.go
index dd109dc..72f9bbf 100644
--- a/makePackagesFile.go
+++ b/makePackagesFile.go
@@ -187,98 +187,3 @@ func populateDebInfo(p *zoopb.Package) error {
// pb.DebInfo should be correctly populated. You can verify these with "mirrors --verify"
return nil
}
-
-/*
-func makeDebianControlFile(p *zoopb.Package, varname string) (string, string) {
- switch varname {
- case "Package":
- return "Package", p.Package
- case "Filename":
- return "Filename", p.Filename
- case "Version":
- return "Version", p.Version
- case "Architecture":
- return "Architecture", p.Architecture
- case "Maintainer":
- return "Maintainer", p.DebInfo.Maintainer
- // return "Maintainer", p.Author
- case "Source":
- if argv.Verbose {
- log.Info("skipping from controlfile", varname)
- // return "Source", p.DebInfo.Source
- }
- return "Source", ""
- case "Conflicts":
- return "Conflicts", p.DebInfo.Conflicts
- case "Packager":
- return "Packager", p.DebInfo.Packager
- // return "Packager", p.Packager
- case "Depends":
- return "Depends", p.DebInfo.Depends
- case "Namespace":
- return "Namespace", p.Namespace
- case "GitHash":
- return "Last-Git-Hash", p.DebInfo.GitHash
- case "GitDate":
- if p.DebInfo.GitDate == "" {
- return "Git-Hash-Date", ""
- }
- return "Git-Hash-Date", cobol.Time(p.DebInfo.GitDate)
- case "BuildDepends":
- return "Build-Depends", p.DebInfo.BuildDepends
- case "InstalledSize":
- return "Installed-Size", p.DebInfo.InstalledSize
- case "Homepage":
- return "Homepage", p.DebInfo.Homepage
- case "PreDepends":
- return "Pre-Depends", p.DebInfo.PreDepends
- case "Suggests":
- return "Suggests", p.DebInfo.Suggests
- case "MultiArch":
- return "Multi-Arch", p.DebInfo.MultiArch
- case "Tag":
- return "Tag", p.DebInfo.Tag
- case "Size":
- return "Size", p.DebInfo.Size
- case "Section":
- return "Section", p.DebInfo.Section
- case "URL":
- return "URL", p.DebInfo.URL
- //case "Size":
- // return "Size", p.DebInfo.Size
- case "BuildDate":
- if p.BuildDate == nil {
- return "Build-Date", ""
- }
- return "Build-Date", cobol.Time(p.BuildDate)
- case "DebCtime":
- return "Deb-File-Date", cobol.Time(p.Ctime)
- case "SHA1":
- return "SHA1", "" // deprecated
- // return "SHA1", p.DebInfo.SHA1
- case "MD5SUM":
- return "MD5Sum", p.DebInfo.MD5SUM
- case "SHA256":
- return "SHA256", p.DebInfo.SHA256
- case "SHA512":
- return "SHA512", "" // totally rediculously overkill
- case "Description":
- var out string
- lines := strings.Split(p.DebInfo.Description, "\n")
- if len(lines) == 0 {
- return "Description", out
- }
- out = "Description: " + strings.TrimSpace(lines[0])
- if len(lines) == 1 {
- return "Description", out
- }
- for _, line := range lines[1:] {
- out += " " + strings.TrimSpace(line)
- }
- return "Description", out
- default:
- dieMaking(varname)
- }
- return "", ""
-}
-*/
generated by cgit v1.2.3 (git 2.51.0) at 2025-11-05 05:20:30 +0000