@@ -50,8 +50,8 @@ var tr = i18n.Tr
50
50
// instantiate as many as needed by providing a different configuration
51
51
// for each one.
52
52
type CoreInstance struct {
53
- PackageManager * packagemanager.PackageManager
54
- lm * librariesmanager.LibrariesManager
53
+ pm * packagemanager.PackageManager
54
+ lm * librariesmanager.LibrariesManager
55
55
}
56
56
57
57
// coreInstancesContainer has methods to add an remove instances atomically.
@@ -106,7 +106,7 @@ func GetPackageManager(id int32) *packagemanager.PackageManager {
106
106
if i == nil {
107
107
return nil
108
108
}
109
- return i .PackageManager
109
+ return i .pm
110
110
}
111
111
112
112
// GetPackageManagerExplorer returns a new package manager Explorer. The
@@ -134,11 +134,11 @@ func (instance *CoreInstance) installToolIfMissing(tool *cores.ToolRelease, down
134
134
return false , nil
135
135
}
136
136
taskCB (& rpc.TaskProgress {Name : tr ("Downloading missing tool %s" , tool )})
137
- if err := instance .PackageManager .DownloadToolRelease (tool , nil , downloadCB ); err != nil {
137
+ if err := instance .pm .DownloadToolRelease (tool , nil , downloadCB ); err != nil {
138
138
return false , fmt .Errorf (tr ("downloading %[1]s tool: %[2]s" ), tool , err )
139
139
}
140
140
taskCB (& rpc.TaskProgress {Completed : true })
141
- if err := instance .PackageManager .InstallTool (tool , taskCB ); err != nil {
141
+ if err := instance .pm .InstallTool (tool , taskCB ); err != nil {
142
142
return false , fmt .Errorf (tr ("installing %[1]s tool: %[2]s" ), tool , err )
143
143
}
144
144
return true , nil
@@ -172,7 +172,7 @@ func Create(req *rpc.CreateRequest, extraUserAgent ...string) (*rpc.CreateRespon
172
172
for _ , ua := range extraUserAgent {
173
173
userAgent += " " + ua
174
174
}
175
- instance .PackageManager = packagemanager .NewBuilder (
175
+ instance .pm = packagemanager .NewBuilder (
176
176
dataDir ,
177
177
configuration .PackagesDir (configuration .Settings ),
178
178
downloadsDir ,
@@ -268,7 +268,7 @@ func Init(req *rpc.InitRequest, responseCallback func(r *rpc.InitResponse)) erro
268
268
// after reinitializing an instance after installing or uninstalling a core.
269
269
// If this is not done the information of the uninstall core is kept in memory,
270
270
// even if it should not.
271
- pmb , commitPackageManager := instance .PackageManager .NewBuilder ()
271
+ pmb , commitPackageManager := instance .pm .NewBuilder ()
272
272
273
273
loadBuiltinTools := func () []error {
274
274
builtinPackage := pmb .GetOrCreatePackage ("builtin" )
@@ -362,7 +362,7 @@ func Init(req *rpc.InitRequest, responseCallback func(r *rpc.InitResponse)) erro
362
362
commitPackageManager ()
363
363
}
364
364
365
- pme , release := instance .PackageManager .NewExplorer ()
365
+ pme , release := instance .pm .NewExplorer ()
366
366
defer release ()
367
367
368
368
for _ , err := range pme .LoadDiscoveries () {
0 commit comments