update Version to enable Version string without the Epoch

This is used in a few filepaths.

Author: paultag

version/version.go

@@ -88,19 +88,21 @@ func (version Version) MarshalControl() (string, error) {
 	return version.String(), nil
 }
 
-func (v Version) String() string {
-	var result string
-	if v.Epoch > 0 {
-		result = strconv.Itoa(int(v.Epoch)) + ":" + v.Version
-	} else {
-		result = v.Version
-	}
+func (v Version) StringWithoutEpoch() string {
+	result := v.Version
 	if len(v.Revision) > 0 {
 		result += "-" + v.Revision
 	}
 	return result
 }
 
+func (v Version) String() string {
+	if v.Epoch > 0 {
+		return fmt.Sprintf("%d:%s", v.Epoch, v.StringWithoutEpoch())
+	}
+	return v.StringWithoutEpoch()
+}
+
 func cisdigit(r rune) bool {
 	return r >= '0' && r <= '9'
 }

version/version_test.go

@@ -29,6 +29,7 @@
 package version // import "pault.ag/go/debian/version"
 
 import (
+	"strings"
 	"testing"
 )
 
@@ -357,4 +358,29 @@ func TestParseInvalidCharactersInRevision(t *testing.T) {
 	}
 }
 
+func TestString(t *testing.T) {
+	if strings.Compare("1.0-1", Version{
+		Version:  "1.0",
+		Revision: "1",
+	}.String()) != 0 {
+		t.Errorf("String() returned malformed Version")
+	}
+
+	if strings.Compare("1:1.0-1", Version{
+		Epoch:    1,
+		Version:  "1.0",
+		Revision: "1",
+	}.String()) != 0 {
+		t.Errorf("String() returned malformed Version with Epoch")
+	}
+
+	if strings.Compare("1.0-1", Version{
+		Epoch:    1,
+		Version:  "1.0",
+		Revision: "1",
+	}.StringWithoutEpoch()) != 0 {
+		t.Errorf("StringWithoutEpoch() returned malformed Version with Epoch")
+	}
+}
+
 // vim:ts=4:sw=4:noexpandtab foldmethod=marker