From 566604d4ba442a27012a841f9d25858bcbdde6fe Mon Sep 17 00:00:00 2001 From: Andrey Smirnov Date: Thu, 10 Jul 2014 00:04:48 +0400 Subject: [PATCH] Revert changes related to NextVersion. #70 It would be done in a bit different way: by introducing powerful search queries. --- deb/version.go | 23 ----------------------- deb/version_test.go | 42 ------------------------------------------ 2 files changed, 65 deletions(-) diff --git a/deb/version.go b/deb/version.go index 6341bd73..e7b11584 100644 --- a/deb/version.go +++ b/deb/version.go @@ -188,29 +188,6 @@ type Dependency struct { Architecture string } -// NextVersion returns the next version of a dependency (eg. if d.Version = 1.9, it returns 1.10) -func (d *Dependency) NextVersion() string { - l := len(d.Version) - - if l == 0 { - return "" - } - - i := l - for i > 0 { - _, err := strconv.ParseUint(d.Version[i-1:l],10,0) - if err != nil { break } - i-- - } - - v, err := strconv.ParseUint(d.Version[i:l],10,0) - if err != nil { - return d.Version - } - - return d.Version[0:i] + strconv.Itoa(int(v)+1) -} - // Hash calculates some predefined unique ID of Dependency func (d *Dependency) Hash() string { return fmt.Sprintf("%s:%s:%d:%s", d.Architecture, d.Pkg, d.Relation, d.Version) diff --git a/deb/version_test.go b/deb/version_test.go index 923dc5f5..53a47b95 100644 --- a/deb/version_test.go +++ b/deb/version_test.go @@ -217,45 +217,3 @@ func (s *VersionSuite) TestDependencyString(c *C) { d.Architecture = "i386" c.Check(d.String(), Equals, "dpkg [i386]") } - -func (s *VersionSuite) TestDependencyNextVersion(c *C){ - d, _ := ParseDependency("dpkg(=1.7)") - d.Architecture = "i386" - c.Check(d.NextVersion(), Equals, "1.8") - - d, _ = ParseDependency("dpkg(=1.9)") - d.Architecture = "i386" - c.Check(d.NextVersion(), Equals, "1.10") - - d, _ = ParseDependency("dpkg(=9)") - d.Architecture = "i386" - c.Check(d.NextVersion(), Equals, "10") - - d, _ = ParseDependency("dpkg(=9.909)") - d.Architecture = "i386" - c.Check(d.NextVersion(), Equals, "9.910") - - d, _ = ParseDependency("dpkg(=9.0.9)") - d.Architecture = "i386" - c.Check(d.NextVersion(), Equals, "9.0.10") - - d, _ = ParseDependency("dpkg(=9.0.100)") - d.Architecture = "i386" - c.Check(d.NextVersion(), Equals, "9.0.101") - - d, _ = ParseDependency("dpkg(=9.0.0-209)") - d.Architecture = "i386" - c.Check(d.NextVersion(), Equals, "9.0.0-210") - - d, _ = ParseDependency("dpkg(=9.0.0-209rel)") - d.Architecture = "i386" - c.Check(d.NextVersion(), Equals, "9.0.0-209rel") - - d, _ = ParseDependency("dpkg(=9.0.0-rel219)") - d.Architecture = "i386" - c.Check(d.NextVersion(), Equals, "9.0.0-rel220") - - d, _ = ParseDependency("dpkg") - d.Architecture = "i386" - c.Check(d.NextVersion(), Equals, "") -}