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

Refactor to use single struct Dependency.

Browse Source
This commit is contained in:
Andrey Smirnov
2014-01-08 18:38:02 +04:00
parent 4969c31e38
commit 5dbb771ba8
3 changed files with 62 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
debian/list.go
Vendored
+9 -7
View File
@@ -66,8 +66,8 @@ const (
// VerifyDependencies looks for missing dependencies in package list.
//
// Analysis would be peformed for each architecture
func (l *PackageList) VerifyDependencies(options int, architectures []string, sources *PackageIndexedList) ([]string, error) {
missing := make([]string, 0, 100)
func (l *PackageList) VerifyDependencies(options int, architectures []string, sources *PackageIndexedList) ([]Dependency, error) {
missing := make([]Dependency, 0, 100)
for _, arch := range architectures {
for _, p := range l.packages {
@@ -76,13 +76,15 @@ func (l *PackageList) VerifyDependencies(options int, architectures []string, so
}
for _, dep := range p.GetDependencies(options) {
pkg, relation, version, err := parseDependency(dep)
dep, err := parseDependency(dep)
if err != nil {
return nil, fmt.Errorf("unable to process pkg %s: %s", p, err)
return nil, fmt.Errorf("unable to process package %s: %s", p, err)
}
if sources.Search(arch, pkg, relation, version) != nil {
missing = append(missing, fmt.Sprintf("%s [%s]", formatDependency(pkg, relation, version), arch))
dep.Architecture = arch
if sources.Search(dep) != nil {
missing = append(missing, dep)
}
}
}
@@ -151,7 +153,7 @@ func (l *PackageIndexedList) Append(pl *PackageList) {
}
// Search searches package index for specified package
func (l *PackageIndexedList) Search(arch string, pkg string, relation int, version string) *Package {
func (l *PackageIndexedList) Search(dep Dependency) *Package {
return nil
}