Skip to content

Commit

Permalink
feat[close #193]: ABRoot doesn't check if package exists before remov…
Browse files Browse the repository at this point in the history
…ing it
  • Loading branch information
mirkobrombin committed Apr 28, 2024
1 parent c97de7e commit e5aa9f0
Showing 1 changed file with 13 additions and 3 deletions.
16 changes: 13 additions & 3 deletions core/packages.go
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,17 @@ func (p *PackageManager) Remove(pkg string) error {
// Check for package manager status and user agreement
err := p.CheckStatus()
if err != nil {
PrintVerboseErr("PackageManager.Add", 0, err)
PrintVerboseErr("PackageManager.Remove", 0, err)
return err
}

// Check if package exists in repo
// FIXME: this should also check if the package is actually installed
// in the system, not just if it exists in the repo. Since this is a distro
// specific feature, I'm leaving it as is for now.
err = p.ExistsInRepo(pkg)
if err != nil {
PrintVerboseErr("PackageManager.Remove", 2, err)
return err
}

Expand All @@ -248,7 +258,7 @@ func (p *PackageManager) Remove(pkg string) error {
// Unstaged will take care of the rest
pkgsAdd, err := p.GetAddPackages()
if err != nil {
PrintVerboseErr("PackageManager.Remove", 2, err)
PrintVerboseErr("PackageManager.Remove", 3, err)
return err
}
for i, ap := range pkgsAdd {
Expand All @@ -262,7 +272,7 @@ func (p *PackageManager) Remove(pkg string) error {
// Abort if package is already removed
pkgsRemove, err := p.GetRemovePackages()
if err != nil {
PrintVerboseErr("PackageManager.Remove", 2.1, err)
PrintVerboseErr("PackageManager.Remove", 4, err)
return err
}
for _, p := range pkgsRemove {
Expand Down

0 comments on commit e5aa9f0

Please sign in to comment.