diff options
| -rw-r--r-- | doVerify.go | 18 | ||||
| -rw-r--r-- | makePackagesFile.go | 11 |
2 files changed, 20 insertions, 9 deletions
diff --git a/doVerify.go b/doVerify.go index af0303a..1be9d7d 100644 --- a/doVerify.go +++ b/doVerify.go @@ -27,14 +27,20 @@ func doVerify() (string, error) { filemap := make(map[string]*zoopb.Package) for p := range me.pb.IterAll() { pdump := log.Sprintf("%v", p) + if !shell.Exists(p.Filename) { + log.Printf("no file Exists() %-130.130s\n", p.Filename) + me.pb.Delete(p) + counter += 1 + continue + } if p.DebInfo == nil { fullname := filepath.Join(me.pb.BaseDir, p.Filename) log.Printf("debinfo == nil. need to run dpkg -I %s\n", fullname) populateDebInfo(p) counter += 1 - if counter > 10 { - break - } + // if counter > 10 { + // break + // } continue } if p.Filename != strings.TrimSpace(p.Filename) { @@ -49,12 +55,6 @@ func doVerify() (string, error) { } // the filename is now valid fullname := filepath.Join(me.pb.BaseDir, p.Filename) - if !shell.Exists(p.Filename) { - log.Printf("no file Exists() %-130.130s\n", fullname) - me.pb.Delete(p) - counter += 1 - continue - } if dupname, ok := filemap[p.Filename]; ok { dupdump := log.Sprintf("%v", dupname) log.Printf("dup filename 1 %-130.130s\n", pdump) diff --git a/makePackagesFile.go b/makePackagesFile.go index 88ddef6..0028aef 100644 --- a/makePackagesFile.go +++ b/makePackagesFile.go @@ -97,12 +97,23 @@ func populateDebInfo(p *zoopb.Package) error { p.DebInfo.URL = varval case "Build-Depends": p.DebInfo.BuildDepends = varval + case "Installed-Size:": case "Installed-Size": p.DebInfo.InstalledSize = varval case "Homepage": p.DebInfo.URL = varval case "Conflicts": p.DebInfo.Conflicts = varval + case "Source-Date": + t, err := cobol.GetTime(varval) + if err == nil { + p.GitDate = timestamppb.New(t) + } else { + if verbose { + log.Info("FIXME: Package-Build-Date", varval, err) + } + } + case "Build-Date": case "Package-Build-Date": t, err := cobol.GetTime(varval) if err == nil { |