diff options
| -rw-r--r-- | doDebian.go | 32 |
1 files changed, 13 insertions, 19 deletions
diff --git a/doDebian.go b/doDebian.go index 52753ca..bbe4044 100644 --- a/doDebian.go +++ b/doDebian.go @@ -64,21 +64,16 @@ func doDebian() error { } } - me.forge.ConfigRill(16, 16) - log.Info("STARTING .deb BUILDS repo len =", found.Len()) - stats := me.forge.RunOnRepos(found, buildDeb) - for s, stat := range stats { - if stat.Err != nil { - log.Info("ERROR WITH buildDeb", s, stat.Err) - return stat.Err - } + if err := doOnlyDebianPackages(); err != nil { + return err } - if argv.DryRun { - return nil + + if !argv.DryRun { + _, err = shell.RunRealtimeError([]string{"do-aptly"}) + return err } - _, err = shell.RunRealtimeError([]string{"do-aptly"}) - return err + return nil } func getStatusEnd(repo *gitpb.Repo) string { @@ -134,17 +129,13 @@ func shouldBuild(repo *gitpb.Repo) bool { if argv.Force { return true } - if strings.HasPrefix(repo.GetState(), "unknown bran") { - return true - } - - if repo.State == "" { - return true - } if repo.State == "need to build" { return true } + if isPackageOnMirrors(repo) { + return false + } return false } @@ -253,6 +244,9 @@ func doOnlyDebianPackages() error { } printRepos(found) + if argv.DryRun { + return nil + } me.forge.ConfigRill(16, 16) log.Info("STARTING .deb BUILDS repo len =", found.Len()) |