File tree Expand file tree Collapse file tree 3 files changed +18
-15
lines changed Expand file tree Collapse file tree 3 files changed +18
-15
lines changed Original file line number Diff line number Diff line change @@ -962,22 +962,22 @@ func (d *Devbox) HasDeprecatedPackages() bool {
962
962
return false
963
963
}
964
964
965
- func (d * Devbox ) findPackageByName (name string ) (string , error ) {
966
- results := map [string ]bool {}
965
+ func (d * Devbox ) findPackageByName (name string ) (* devpkg. Package , error ) {
966
+ results := map [* devpkg. Package ]bool {}
967
967
for _ , pkg := range d .configPackages () {
968
968
if pkg .String () == name || pkg .CanonicalName () == name {
969
- results [pkg . String () ] = true
969
+ results [pkg ] = true
970
970
}
971
971
}
972
972
if len (results ) > 1 {
973
- return "" , usererr .New (
973
+ return nil , usererr .New (
974
974
"found multiple packages with name %s: %s. Please specify version" ,
975
975
name ,
976
976
lo .Keys (results ),
977
977
)
978
978
}
979
979
if len (results ) == 0 {
980
- return "" , usererr .New ("no package found with name %s" , name )
980
+ return nil , usererr .New ("no package found with name %s" , name )
981
981
}
982
982
return lo .Keys (results )[0 ], nil
983
983
}
Original file line number Diff line number Diff line change @@ -57,7 +57,9 @@ func (d *Devbox) Add(ctx context.Context, pkgsNames ...string) error {
57
57
// it. Ignore error (which is either missing or more than one). We search by
58
58
// CanonicalName so any legacy or versioned packages will be removed if they
59
59
// match.
60
- if name , _ := d .findPackageByName (pkg .CanonicalName ()); name != "" {
60
+ found , _ := d .findPackageByName (pkg .CanonicalName ())
61
+ // TODO savil: should name be found.Raw?
62
+ if name := found .String (); name != "" {
61
63
if err := d .Remove (ctx , name ); err != nil {
62
64
return err
63
65
}
@@ -134,9 +136,10 @@ func (d *Devbox) Remove(ctx context.Context, pkgs ...string) error {
134
136
missingPkgs := []string {}
135
137
for _ , pkg := range lo .Uniq (pkgs ) {
136
138
found , _ := d .findPackageByName (pkg )
137
- if found != "" {
138
- packagesToUninstall = append (packagesToUninstall , found )
139
- d .cfg .Packages .Remove (found )
139
+ 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 )
140
143
} else {
141
144
missingPkgs = append (missingPkgs , pkg )
142
145
}
Original file line number Diff line number Diff line change @@ -66,19 +66,19 @@ func (d *Devbox) Update(ctx context.Context, pkgs ...string) error {
66
66
}
67
67
68
68
func (d * Devbox ) inputsToUpdate (pkgs ... string ) ([]* devpkg.Package , error ) {
69
- var pkgsToUpdate []string
69
+ if len (pkgs ) == 0 {
70
+ return d .configPackages (), nil
71
+ }
72
+
73
+ var pkgsToUpdate []* devpkg.Package
70
74
for _ , pkg := range pkgs {
71
75
found , err := d .findPackageByName (pkg )
72
76
if err != nil {
73
77
return nil , err
74
78
}
75
79
pkgsToUpdate = append (pkgsToUpdate , found )
76
80
}
77
- if len (pkgsToUpdate ) == 0 {
78
- pkgsToUpdate = d .PackageNames ()
79
- }
80
-
81
- return devpkg .PackageFromStrings (pkgsToUpdate , d .lockfile ), nil
81
+ return pkgsToUpdate , nil
82
82
}
83
83
84
84
func (d * Devbox ) updateDevboxPackage (
You can’t perform that action at this time.
0 commit comments