Skip to content

Commit 6e0b77c

Browse files
committed
use Pkg.Raw instead of pkg.String
1 parent 08fd998 commit 6e0b77c

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

internal/impl/devbox.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -965,7 +965,7 @@ func (d *Devbox) HasDeprecatedPackages() bool {
965965
func (d *Devbox) findPackageByName(name string) (*devpkg.Package, error) {
966966
results := map[*devpkg.Package]bool{}
967967
for _, pkg := range d.configPackages() {
968-
if pkg.String() == name || pkg.CanonicalName() == name {
968+
if pkg.Raw == name || pkg.CanonicalName() == name {
969969
results[pkg] = true
970970
}
971971
}

internal/impl/packages.go

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,7 @@ func (d *Devbox) Add(ctx context.Context, pkgsNames ...string) error {
5959
// match.
6060
found, _ := d.findPackageByName(pkg.CanonicalName())
6161
if found != nil {
62-
name := found.String() // TODO savil: should name be found.Raw?
63-
if err := d.Remove(ctx, name); err != nil {
62+
if err := d.Remove(ctx, found.Raw); err != nil {
6463
return err
6564
}
6665
}
@@ -137,9 +136,8 @@ func (d *Devbox) Remove(ctx context.Context, pkgs ...string) error {
137136
for _, pkg := range lo.Uniq(pkgs) {
138137
found, _ := d.findPackageByName(pkg)
139138
if found != nil {
140-
name := found.String() // TODO savil. should this be found.Raw?
141-
packagesToUninstall = append(packagesToUninstall, name)
142-
d.cfg.Packages.Remove(name)
139+
packagesToUninstall = append(packagesToUninstall, found.Raw)
140+
d.cfg.Packages.Remove(found.Raw)
143141
} else {
144142
missingPkgs = append(missingPkgs, pkg)
145143
}

0 commit comments

Comments
 (0)