Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move repo install to after numbermenus #264

Merged
merged 1 commit into from
Mar 21, 2018
Merged

Move repo install to after numbermenus #264

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Move repo install to after numbermenus
  • Loading branch information
@Morganamilo
Morganamilo committed Mar 21, 2018
commit 885614ef45d9c3fe802da85b503a58d6d3e147e9
89 changes: 43 additions & 46 deletions install.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,14 @@ import (
func install(parser *arguments) error {
requestTargets := parser.targets.toSlice()
var err error
if err != nil {
return err
}

var incompatable stringSet
var dc *depCatagories
var toClean []*rpc.Pkg
var toEdit []*rpc.Pkg

removeMake := false
srcinfosStale := make(map[string]*gopkg.PKGBUILD)
srcinfos := make(map[string]*gopkg.PKGBUILD)
var dc *depCatagories

//remotenames: names of all non repo packages on the system
_, _, _, remoteNames, err := filterPackages()
if err != nil {
Expand Down Expand Up @@ -131,40 +129,14 @@ func install(parser *arguments) error {
return err
}
}
}

if !parser.existsArg("gendb") && len(arguments.targets) > 0 {
err := passToPacman(arguments)
if err != nil {
return fmt.Errorf("Error installing repo packages")
}

depArguments := makeArguments()
depArguments.addArg("D", "asdeps")

for _, pkg := range dc.Repo {
depArguments.addTarget(pkg.Name())
}
for pkg := range dt.Repo {
depArguments.delTarget(pkg)
}

if len(depArguments.targets) > 0 {
_, stderr, err := passToPacmanCapture(depArguments)
if err != nil {
return fmt.Errorf("%s%s", stderr, err)
}
}
}

if hasAur {
if len(dc.MakeOnly) > 0 {
if !continueTask("Remove make dependencies after install?", "yY") {
removeMake = true
}
}

toClean, toEdit, err := cleanEditNumberMenu(dc.Aur, dc.Bases, remoteNamesCache)
toClean, toEdit, err = cleanEditNumberMenu(dc.Aur, dc.Bases, remoteNamesCache)
if err != nil {
return err
}
Expand All @@ -182,15 +154,6 @@ func install(parser *arguments) error {
}
}

if len(toEdit) > 0 && !continueTask("Proceed with install?", "nN") {
return fmt.Errorf("Aborting due to user")
}

//conflicts have been checked so answer y for them
ask, _ := strconv.Atoi(cmdArgs.globals["ask"])
uask := alpm.QuestionType(ask) | alpm.QuestionTypeConflictPkg
cmdArgs.globals["ask"] = fmt.Sprint(uask)

//inital srcinfo parse before pkgver() bump
err = parsesrcinfosFile(dc.Aur, srcinfosStale, dc.Bases)
if err != nil {
Expand All @@ -215,11 +178,45 @@ func install(parser *arguments) error {
return err
}


err = checkPgpKeys(dc.Aur, dc.Bases, srcinfosStale)
if err != nil {
return err
}
}

if !parser.existsArg("gendb") && len(arguments.targets) > 0 {
err := passToPacman(arguments)
if err != nil {
return fmt.Errorf("Error installing repo packages")
}

depArguments := makeArguments()
depArguments.addArg("D", "asdeps")

for _, pkg := range dc.Repo {
depArguments.addTarget(pkg.Name())
}
for pkg := range dt.Repo {
depArguments.delTarget(pkg)
}

if len(depArguments.targets) > 0 {
_, stderr, err := passToPacmanCapture(depArguments)
if err != nil {
return fmt.Errorf("%s%s", stderr, err)
}
}
} else if hasAur {
if len(toEdit) > 0 && !continueTask("Proceed with install?", "nN") {
return fmt.Errorf("Aborting due to user")
}
}

if hasAur {
//conflicts have been checked so answer y for them
ask, _ := strconv.Atoi(cmdArgs.globals["ask"])
uask := alpm.QuestionType(ask) | alpm.QuestionTypeConflictPkg
cmdArgs.globals["ask"] = fmt.Sprint(uask)

err = downloadPkgBuildsSources(dc.Aur, dc.Bases, incompatable)
if err != nil {
Expand All @@ -230,7 +227,7 @@ func install(parser *arguments) error {
if err != nil {
return err
}

err = buildInstallPkgBuilds(dc.Aur, srcinfos, parser.targets, parser, dc.Bases, incompatable)
if err != nil {
return err
Expand Down Expand Up @@ -275,7 +272,7 @@ func getIncompatable(pkgs []*rpc.Pkg, srcinfos map[string]*gopkg.PKGBUILD, bases
return nil, err
}

nextpkg:
nextpkg:
for _, pkg := range pkgs {
for _, arch := range srcinfos[pkg.PackageBase].Arch {
if arch == "any" || arch == alpmArch {
Expand Down Expand Up @@ -539,7 +536,7 @@ func parsesrcinfosFile(pkgs []*rpc.Pkg, srcinfos map[string]*gopkg.PKGBUILD, bas
return fmt.Errorf("%s: %s", pkg.Name, err)
}

srcinfos[pkg.PackageBase] = pkgbuild
srcinfos[pkg.PackageBase] = pkgbuild
}

return nil
Expand Down