vincent/aptly
1
0
Fork 0
mirror of https://github.com/aptly-dev/aptly.git synced 2026-05-30 04:20:53 +00:00
Code Issues Projects Releases Wiki Activity

Make decorator for architecture be in curly braces, so there's no conflict with Debian "only for arch".

Browse Source
This commit is contained in:
Andrey Smirnov
2014-02-17 15:05:34 +04:00
parent 5af0c45e10
commit 7ab456f6ff
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
debian/version.go
Vendored
+2 -2
View File
@@ -230,8 +230,8 @@ func ParseDependencyVariants(variants string) (l []Dependency, err error) {
// ParseDependency parses dependency in format "pkg (>= 1.35) [arch]" into parts // ParseDependency parses dependency in format "pkg (>= 1.35) [arch]" into parts
func ParseDependency(dep string) (d Dependency, err error) { func ParseDependency(dep string) (d Dependency, err error) {
if strings.HasSuffix(dep, "]") { if strings.HasSuffix(dep, "}") {
i := strings.LastIndex(dep, "[") i := strings.LastIndex(dep, "{")
if i == -1 { if i == -1 {
err = fmt.Errorf("unable to parse dependency: %s", dep) err = fmt.Errorf("unable to parse dependency: %s", dep)
return return
debian/version_test.go
Vendored
+4 -4
View File
@@ -142,14 +142,14 @@ func (s *VersionSuite) TestParseDependency(c *C) {
c.Check(d.Relation, Equals, VersionGreater) c.Check(d.Relation, Equals, VersionGreater)
c.Check(d.Version, Equals, "1.6") c.Check(d.Version, Equals, "1.6")
d, e = ParseDependency("dpkg (>>1.6) [i386]") d, e = ParseDependency("dpkg (>>1.6) {i386}")
c.Check(e, IsNil) c.Check(e, IsNil)
c.Check(d.Pkg, Equals, "dpkg") c.Check(d.Pkg, Equals, "dpkg")
c.Check(d.Relation, Equals, VersionGreater) c.Check(d.Relation, Equals, VersionGreater)
c.Check(d.Version, Equals, "1.6") c.Check(d.Version, Equals, "1.6")
c.Check(d.Architecture, Equals, "i386") c.Check(d.Architecture, Equals, "i386")
d, e = ParseDependency("dpkg[i386]") d, e = ParseDependency("dpkg{i386}")
c.Check(e, IsNil) c.Check(e, IsNil)
c.Check(d.Pkg, Equals, "dpkg") c.Check(d.Pkg, Equals, "dpkg")
c.Check(d.Relation, Equals, VersionDontCare) c.Check(d.Relation, Equals, VersionDontCare)
@@ -168,10 +168,10 @@ func (s *VersionSuite) TestParseDependency(c *C) {
d, e = ParseDependency("dpkg==1.6)") d, e = ParseDependency("dpkg==1.6)")
c.Check(e, ErrorMatches, "unable to parse.*") c.Check(e, ErrorMatches, "unable to parse.*")
d, e = ParseDependency("dpkg i386]") d, e = ParseDependency("dpkg i386}")
c.Check(e, ErrorMatches, "unable to parse.*") c.Check(e, ErrorMatches, "unable to parse.*")
d, e = ParseDependency("dpkg ) [i386]") d, e = ParseDependency("dpkg ) {i386}")
c.Check(e, ErrorMatches, "unable to parse.*") c.Check(e, ErrorMatches, "unable to parse.*")
} }