From 704c8957b2d3958ff6e030c0badc75f808ea8a9f Mon Sep 17 00:00:00 2001 From: KatolaZ Date: Sat, 13 Jan 2018 23:44:19 +0000 Subject: Distinct dest dir for each release --- deb822/package.go | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'deb822') diff --git a/deb822/package.go b/deb822/package.go index 41a9613..525f112 100644 --- a/deb822/package.go +++ b/deb822/package.go @@ -79,7 +79,7 @@ func PrintPackage(p Package, templ string, out io.Writer) { /*Stanza2HtmlPage Render the html webpage of a package and save it in the /* corresponding "pool" directory. */ -func Stanza2HtmlPage(s Stanza, templ string, baseDir string, suite string, component string) error { +func Stanza2HtmlPage(s Stanza, templ string, baseDir string, release string, suite string, component string) error { fname := s["Filename"] if fname == "" { @@ -91,21 +91,17 @@ func Stanza2HtmlPage(s Stanza, templ string, baseDir string, suite string, compo if err != nil { log.Fatal("empty package!!!") } - nameVersion := fmt.Sprintf("%s_%s", p.Name, p.Version) - //fmt.Printf(" nameVersion: %s\n", nameVersion) - //fmt.Printf(" baseDir: %s\n", baseDir) + //nameVersion := fmt.Sprintf("%s_%s", p.Name, p.Version) fname = regexpRemove.ReplaceAllString(fname, "") - //fmt.Printf(" fname: %s\n", fname) - - /// FIXME!!!! ERROR IN DETECTION OF PACKAGE NAME!!!! - dirName := fmt.Sprintf("%s/%s", baseDir, strings.Split(fname, nameVersion)[0]) + //dirName := fmt.Sprintf("%s/%s", baseDir, strings.Split(fname, nameVersion)[0]) + dirName := fmt.Sprintf("%s/%s/%s/", baseDir, release, suite) err = os.MkdirAll(dirName, 0755) if err == nil { - //fmt.Printf(" dirName: %s\n Package: %s\n Version: %s\n", dirName, p.Name, p.Version) + //htmlFile := fmt.Sprintf("%s%s_%s.html", dirName, p.Name, p.Version) htmlFile := fmt.Sprintf("%s%s_%s.html", dirName, p.Name, p.Version) - //fmt.Printf("Creating file: %s\n---------\n", htmlFile) + if f, err := os.Open(htmlFile); err == nil { f.Close() fmt.Fprintf(os.Stderr, " Skipping %s -- it exists\n", htmlFile) -- cgit v1.2.3