Also install repo dependencies when installing AUR packages
This commit is contained in:
+14
-5
@@ -268,17 +268,26 @@ func resolveAndInstallDeps(f *fetch.Fetcher, aurInfo *aur.Package, logWriter io.
|
|||||||
return fmt.Errorf("failed to resolve dependencies: %w", err)
|
return fmt.Errorf("failed to resolve dependencies: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
var aurDeps []string
|
var repoDeps, aurDeps []string
|
||||||
for _, dep := range depends {
|
for _, dep := range depends {
|
||||||
info := resolved[dep]
|
info := resolved[dep]
|
||||||
if info.Installed {
|
if info.Installed {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
if info.Exists {
|
pkg := dep
|
||||||
continue
|
if info.Provided != "" {
|
||||||
|
pkg = info.Provided
|
||||||
}
|
}
|
||||||
if info.InAUR {
|
if info.Exists {
|
||||||
aurDeps = append(aurDeps, dep)
|
repoDeps = append(repoDeps, pkg)
|
||||||
|
} else if info.InAUR {
|
||||||
|
aurDeps = append(aurDeps, pkg)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(repoDeps) > 0 {
|
||||||
|
if err := SyncPackages(repoDeps, logWriter); err != nil {
|
||||||
|
return fmt.Errorf("failed to install repo dependencies: %w", err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user