common versionv0.22.0v0.21.4

2 files changed, 4 insertions, 9 deletions

diff --git a/addRepo.go b/addRepo.go
index f679107..1722d41 100644
--- a/addRepo.go
+++ b/addRepo.go
@@ -67,19 +67,17 @@ func (c *controlBox) addRepo(path string) {
 
 	cbname := c.status.GetCurrentBranchName()
 	cbversion := c.status.GetCurrentBranchVersion()
-	debversion := strings.TrimPrefix(cbversion, "v")
+	debversion := c.status.DebianCurrentVersion()
 
 	if c.status.CheckDirty() {
 		c.dirtyL.SetText("true")
-		debversion = debversion + "-dirty"
 	} else {
 		c.dirtyL.SetText("false")
 	}
 
 	lasttag := c.status.GetLastTagVersion()
 	if args.Release {
-		debversion = lasttag
-		debversion = strings.TrimPrefix(debversion, "v")
+		debversion = c.status.DebianReleaseVersion()
 		c.dirtyL.SetText("false")
 	}
 
diff --git a/buildPackage.go b/buildPackage.go
index 3a4310c..3e511d2 100644
--- a/buildPackage.go
+++ b/buildPackage.go
@@ -11,7 +11,6 @@ import (
 	"strings"
 	"time"
 
-	"go.wit.com/lib/gui/repolist"
 	"go.wit.com/lib/gui/shell"
 	"go.wit.com/log"
 )
@@ -39,10 +38,8 @@ func (c *controlBox) buildPackage() (bool, error) {
 	}
 
 	arch := c.Architecture.String()
-	tmp := c.Version.String()
-	version := repolist.ValidDebianPackageVersion(tmp)
-	log.Info("version went from", tmp, "to", version)
-	os.Exit(-1)
+	version := c.Version.String()
+	log.Info("version is:", version)
 	debname := filename + "_" + version + "_" + arch + ".deb"
 	fulldebname := filepath.Join(homeDir, "incoming", debname)
 	if shell.Exists(fulldebname) {