summaryrefslogtreecommitdiff
path: root/main.go
diff options
context:
space:
mode:
Diffstat (limited to 'main.go')
-rw-r--r--main.go28
1 files changed, 11 insertions, 17 deletions
diff --git a/main.go b/main.go
index e2a8967..395bcc6 100644
--- a/main.go
+++ b/main.go
@@ -56,7 +56,7 @@ func main() {
} else {
me.pb.Architecture = argv.Arch
}
- me.pb.Version = trimNonNumericPrefix(me.repo.GetCurrentVersion())
+ me.pb.Version = trimNonNumericPrefix(me.repo.DebianCurrentVersion())
me.pb.DebInfo.URL = me.repo.URL
me.pb.DebInfo.Homepage = me.repo.URL // deprecate this usage (?)
log.Info("INITIAL PARSE RESULT:")
@@ -88,20 +88,15 @@ func main() {
me.repo.Namespace = basename
os.Chdir(debpath)
- // look for a 'config' file in the repo
- if readControlFile(me.repo) == nil {
- log.Warn("scan worked")
- } else {
- log.Warn("scan failed")
- }
- // computeControlValues(me.repo)
-
- if argv.Dump != nil {
- for v := range me.repo.Control {
- log.Infof("CONTROL: %s: %s\n", v, me.repo.Control[v])
+ /*
+ // look for a 'config' file in the repo
+ if readControlFile(me.repo) == nil {
+ log.Warn("scan worked")
+ } else {
+ log.Warn("scan failed")
}
- okExit("")
- }
+ // computeControlValues(me.repo)
+ */
if argv.Gui != nil {
// only load teh toolkit if you get this far
@@ -112,10 +107,9 @@ func main() {
log.Info("go-deb: attempting to build package")
if ok, err := buildPackage(me.repo); ok {
- log.Info("build worked")
+ me.sh.GoodExit("build worked")
} else {
- log.Warn("build failed:", err)
- os.Exit(-1)
+ me.sh.BadExit("build failed", err)
}
os.Exit(0)
}