When requiring source package, specify exact version of binary package.

This commit is contained in:
Andrey Smirnov
2014-02-17 15:35:48 +04:00
parent b19e6cfadd
commit c2f01c8aa1
2 changed files with 2 additions and 2 deletions
+1 -1
View File
@@ -254,7 +254,7 @@ func (p *Package) GetDependencies(options int) (dependencies []string) {
} }
if options&DepFollowSource == DepFollowSource && p.Source != "" { if options&DepFollowSource == DepFollowSource && p.Source != "" {
dependencies = append(dependencies, p.Source+" {source}") dependencies = append(dependencies, fmt.Sprintf("%s (= %s) {source}", p.Source, p.Version))
} }
return return
+1 -1
View File
@@ -189,7 +189,7 @@ func (s *PackageSuite) TestGetDependencies(c *C) {
c.Check(p.GetDependencies(0), DeepEquals, []string{"libc6 (>= 2.7)", "alien-arena-data (>= 7.40)", "dpkg (>= 1.6)"}) c.Check(p.GetDependencies(0), DeepEquals, []string{"libc6 (>= 2.7)", "alien-arena-data (>= 7.40)", "dpkg (>= 1.6)"})
c.Check(p.GetDependencies(DepFollowSuggests), DeepEquals, []string{"libc6 (>= 2.7)", "alien-arena-data (>= 7.40)", "dpkg (>= 1.6)", "alien-arena-mars"}) c.Check(p.GetDependencies(DepFollowSuggests), DeepEquals, []string{"libc6 (>= 2.7)", "alien-arena-data (>= 7.40)", "dpkg (>= 1.6)", "alien-arena-mars"})
c.Check(p.GetDependencies(DepFollowSuggests|DepFollowRecommends), DeepEquals, []string{"libc6 (>= 2.7)", "alien-arena-data (>= 7.40)", "dpkg (>= 1.6)", "aliean-arena-luna", "alien-arena-mars"}) c.Check(p.GetDependencies(DepFollowSuggests|DepFollowRecommends), DeepEquals, []string{"libc6 (>= 2.7)", "alien-arena-data (>= 7.40)", "dpkg (>= 1.6)", "aliean-arena-luna", "alien-arena-mars"})
c.Check(p.GetDependencies(DepFollowSource), DeepEquals, []string{"libc6 (>= 2.7)", "alien-arena-data (>= 7.40)", "dpkg (>= 1.6)", "alien-arena {source}"}) c.Check(p.GetDependencies(DepFollowSource), DeepEquals, []string{"libc6 (>= 2.7)", "alien-arena-data (>= 7.40)", "dpkg (>= 1.6)", "alien-arena (= 7.40-2) {source}"})
p, _ = NewSourcePackageFromControlFile(s.sourceStanza) p, _ = NewSourcePackageFromControlFile(s.sourceStanza)
c.Check(p.GetDependencies(0), DeepEquals, []string{}) c.Check(p.GetDependencies(0), DeepEquals, []string{})