diff options
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | doBuild.debian.go | 17 | ||||
| -rw-r--r-- | doBuild.go | 15 |
3 files changed, 22 insertions, 14 deletions
@@ -70,9 +70,7 @@ deb-with-commits: rm -f ~/incoming/*.deb forge commit --all forge normal - wit build install - wit test version - wit build deb --force + wit build deb deb-with-commits-all: make commit diff --git a/doBuild.debian.go b/doBuild.debian.go index 0c0013b..bf2df2c 100644 --- a/doBuild.debian.go +++ b/doBuild.debian.go @@ -106,8 +106,16 @@ func doBuildDeb(all *gitpb.Repos) (string, error) { return "incoming/ not empty", errors.New("already have incoming files") } - footer := printPackagingTable(all) - log.Info("This is what will and will not be built:", footer) + for r := range all.IterAll() { + log.Info(r.FullPath, r.DirtyList) + } + + //footer := printPackagingTable(all) + //log.Info("This is what will and will not be built:", footer) + + if argv.DryRun { + return "dryrun", nil + } me.forge.ConfigRill(16, 16) stats := me.forge.RunOnRepos(all, runFromDL) @@ -138,7 +146,10 @@ func doBuildDeb(all *gitpb.Repos) (string, error) { func runFromDL(repo *gitpb.Repo) error { var err error cmd := repo.DirtyList - log.Info("Building", cmd) + log.Printf("Building (%v) dl.Len(%d) cmd.Len(%d)\n", cmd, len(repo.DirtyList), len(cmd)) + if len(cmd) == 0 { + return errors.New("cmd was blank") + } if _, err = repo.RunVerboseOnError(cmd); err != nil { log.Info(repo.FullPath, cmd) return err @@ -100,19 +100,18 @@ func doBuild() (string, error) { cmdstr := fmt.Sprintf("%v", cmd) simpletable = append(simpletable, []string{debname, p.Version, age, smartver, bcount, curver, newcount, arches, cmdstr}) - newr := tobuild.Clone(repo) - newr.DirtyList = cmd + repo.DirtyList = cmd + tobuild.Clone(repo) } footer := cobol.SimpleTable(simpletable) log.Info("simple build table footer:", footer) - if !argv.DryRun { - return doBuildDeb(tobuild) - } - for r := range tobuild.IterAll() { - log.Info(r.FullPath, r.DirtyList) - } + // for r := range tobuild.IterAll() { + // log.Info(r.FullPath, r.DirtyList) + // } + + return doBuildDeb(tobuild) } return "todo: doBuild()", nil } |