Skip to content

Commit 3be9f91

Browse files
committed
Made CoreInstance.PackageManager field private
1 parent cc1072a commit 3be9f91

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

commands/instances.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ var tr = i18n.Tr
5050
// instantiate as many as needed by providing a different configuration
5151
// for each one.
5252
type CoreInstance struct {
53-
PackageManager *packagemanager.PackageManager
54-
lm *librariesmanager.LibrariesManager
53+
pm *packagemanager.PackageManager
54+
lm *librariesmanager.LibrariesManager
5555
}
5656

5757
// coreInstancesContainer has methods to add an remove instances atomically.
@@ -106,7 +106,7 @@ func GetPackageManager(id int32) *packagemanager.PackageManager {
106106
if i == nil {
107107
return nil
108108
}
109-
return i.PackageManager
109+
return i.pm
110110
}
111111

112112
// GetPackageManagerExplorer returns a new package manager Explorer. The
@@ -134,11 +134,11 @@ func (instance *CoreInstance) installToolIfMissing(tool *cores.ToolRelease, down
134134
return false, nil
135135
}
136136
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 {
138138
return false, fmt.Errorf(tr("downloading %[1]s tool: %[2]s"), tool, err)
139139
}
140140
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 {
142142
return false, fmt.Errorf(tr("installing %[1]s tool: %[2]s"), tool, err)
143143
}
144144
return true, nil
@@ -172,7 +172,7 @@ func Create(req *rpc.CreateRequest, extraUserAgent ...string) (*rpc.CreateRespon
172172
for _, ua := range extraUserAgent {
173173
userAgent += " " + ua
174174
}
175-
instance.PackageManager = packagemanager.NewBuilder(
175+
instance.pm = packagemanager.NewBuilder(
176176
dataDir,
177177
configuration.PackagesDir(configuration.Settings),
178178
downloadsDir,
@@ -268,7 +268,7 @@ func Init(req *rpc.InitRequest, responseCallback func(r *rpc.InitResponse)) erro
268268
// after reinitializing an instance after installing or uninstalling a core.
269269
// If this is not done the information of the uninstall core is kept in memory,
270270
// even if it should not.
271-
pmb, commitPackageManager := instance.PackageManager.NewBuilder()
271+
pmb, commitPackageManager := instance.pm.NewBuilder()
272272

273273
loadBuiltinTools := func() []error {
274274
builtinPackage := pmb.GetOrCreatePackage("builtin")
@@ -362,7 +362,7 @@ func Init(req *rpc.InitRequest, responseCallback func(r *rpc.InitResponse)) erro
362362
commitPackageManager()
363363
}
364364

365-
pme, release := instance.PackageManager.NewExplorer()
365+
pme, release := instance.pm.NewExplorer()
366366
defer release()
367367

368368
for _, err := range pme.LoadDiscoveries() {

0 commit comments

Comments
 (0)