vincent/aptly
1
0
Fork 0
mirror of https://github.com/aptly-dev/aptly.git synced 2026-05-06 22:18:28 +00:00
Code Issues Projects Releases Wiki Activity

Revert changes related to NextVersion. #70

Browse Source 
It would be done in a bit different way: by introducing powerful search queries.
This commit is contained in:
Andrey Smirnov
2014-07-10 00:04:48 +04:00
parent 58a57f2b2c
commit 566604d4ba
2 changed files with 0 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
deb/version.go
-23
View File
@@ -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)
deb/version_test.go
-42
View File
@@ -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, "")
}