duh, use argv.

2 files changed, 13 insertions, 10 deletions

diff --git a/argv.go b/argv.go
index 23a9486..24e6533 100644
--- a/argv.go
+++ b/argv.go
@@ -55,7 +55,7 @@ func (args) Appname() string {
 }
 
 func (a args) DoAutoComplete(pb *prep.Auto) {
-	base := []string{"--version", "oldway", "--dry-run", "--force", "incoming", "walk", "list", "makedists", "verify", "newest", "--create"}
+	base := []string{"oldway", "--dry-run", "--force", "incoming", "walk", "list", "makedists", "verify", "newest", "--create", "--verbose"}
 
 	if pb.Cmd == "" {
 		pb.Autocomplete3(base)
diff --git a/makePackagesFile.go b/makePackagesFile.go
index 0028aef..c19081d 100644
--- a/makePackagesFile.go
+++ b/makePackagesFile.go
@@ -14,7 +14,6 @@ import (
 )
 
 func populateDebInfo(p *zoopb.Package) error {
-	var verbose bool = false
 	if p.DebInfo != nil {
 		// already added p.DebInfo
 		return nil
@@ -38,14 +37,14 @@ func populateDebInfo(p *zoopb.Package) error {
 		parts := strings.Fields(line)
 		if starting {
 			if parts[0] == "new" {
-				if verbose {
+				if argv.Verbose {
 					log.Printf("new: %v\n", parts)
 				}
 				// skip the first dpkg -I line
 				continue
 			}
 			if parts[0] == "size" {
-				if verbose {
+				if argv.Verbose {
 					log.Printf("size: %v\n", parts)
 				}
 				p.DebInfo.InstalledSize = parts[1]
@@ -54,7 +53,7 @@ func populateDebInfo(p *zoopb.Package) error {
 					line = scanner.Text()
 					parts = strings.Fields(line)
 					if strings.HasPrefix(line, "  ") {
-						if verbose {
+						if argv.Verbose {
 							log.Printf("sizeline: %v\n", parts)
 						}
 						continue
@@ -64,7 +63,7 @@ func populateDebInfo(p *zoopb.Package) error {
 				}
 			}
 			if starting {
-				if verbose {
+				if argv.Verbose {
 					log.Printf("parts: %v\n", parts)
 				}
 				continue
@@ -109,7 +108,7 @@ func populateDebInfo(p *zoopb.Package) error {
 			if err == nil {
 				p.GitDate = timestamppb.New(t)
 			} else {
-				if verbose {
+				if argv.Verbose {
 					log.Info("FIXME: Package-Build-Date", varval, err)
 				}
 			}
@@ -119,12 +118,12 @@ func populateDebInfo(p *zoopb.Package) error {
 			if err == nil {
 				p.BuildDate = timestamppb.New(t)
 			} else {
-				if verbose {
+				if argv.Verbose {
 					log.Info("FIXME: Package-Build-Date", varval, err)
 				}
 			}
 		case "Git-Tag-Date":
-			if verbose {
+			if argv.Verbose {
 				log.Info("FIXME: Git-Tag-Date", varval)
 			}
 		case "Description":
@@ -173,7 +172,11 @@ func getDebianControlFile(p *zoopb.Package, varname string) (string, string) {
 		return "Maintainer", p.DebInfo.Maintainer
 		// return "Maintainer", p.Author
 	case "Source":
-		return "Source", p.DebInfo.Source
+		if argv.Verbose {
+			log.Info("skipping from controlfile", varname)
+			// return "Source", p.DebInfo.Source
+		}
+		return "Source", ""
 	case "Conflicts":
 		return "Conflicts", p.DebInfo.Conflicts
 	case "Packager":