fixing packaging logic

3 files changed, 8 insertions, 11 deletions

diff --git a/doDebian.go b/doDebian.go
index 840528d..4308d8d 100644
--- a/doDebian.go
+++ b/doDebian.go
@@ -85,13 +85,6 @@ func isDebianRelease() bool {
 	return argv.Build.Debian.Release
 }
 
-func shouldBuild(check *gitpb.Repo) bool {
-	if isPackageOnMirrors(check) {
-		return false
-	}
-	return true
-}
-
 func buildDeb(check *gitpb.Repo) error {
 	var cmd []string
 
@@ -113,8 +106,12 @@ func buildDeb(check *gitpb.Repo) error {
 		cmd = append(cmd, "--verbose")
 	}
 
-	if !shouldBuild(check) {
-		return nil
+	if argv.Force {
+		// skip checks
+	} else {
+		if isPackageOnMirrors(check) {
+			return nil
+		}
 	}
 
 	if argv.DryRun {
diff --git a/doUpgrade.go b/doUpgrade.go
index a94e680..edf0f81 100644
--- a/doUpgrade.go
+++ b/doUpgrade.go
@@ -31,7 +31,7 @@ func doUpgrade() error {
 	me.machine, _ = zoopb.InitMachine()
 
 	if argv.Upgrade.List != nil {
-		if argv.Upgrade.All {
+		if argv.All {
 			doPackageList(true)
 		} else {
 			doPackageList(false)
diff --git a/tableRepos.go b/tableRepos.go
index 57be680..7d322fc 100644
--- a/tableRepos.go
+++ b/tableRepos.go
@@ -87,7 +87,7 @@ func printPackagingTable(pb *gitpb.Repos) {
 	col.Width = 4
 
 	col = tablePB.AddStringFunc("build", func(r *gitpb.Repo) string {
-		if shouldBuild(r) {
+		if isPackageOnMirrors(r) {
 			return "yes"
 		}
 		return ""