Skip to content

Commit 61ac16a

Browse files
committed
fix: initialize in builder
1 parent 35a4eea commit 61ac16a

File tree

1 file changed

+13
-8
lines changed

1 file changed

+13
-8
lines changed

Diff for: arduino/cores/packagemanager/package_manager.go

+13-8
Original file line numberDiff line numberDiff line change
@@ -98,20 +98,25 @@ func (pmb *Builder) BuildIntoExistingPackageManager(target *PackageManager) {
9898
target.tempDir = pmb.tempDir
9999
target.packagesCustomGlobalProperties = pmb.packagesCustomGlobalProperties
100100
target.profile = pmb.profile
101-
if target.discoveryManager != nil {
102-
target.discoveryManager.Clear()
103-
} else {
104-
target.discoveryManager = pmb.discoveryManager
105-
}
101+
target.discoveryManager.Clear()
106102
target.discoveryManager.AddAllDiscoveriesFrom(pmb.discoveryManager)
107103
target.userAgent = pmb.userAgent
108104
}
109105

110106
// Build builds a new PackageManager.
111107
func (pmb *Builder) Build() *PackageManager {
112-
res := &PackageManager{}
113-
pmb.BuildIntoExistingPackageManager(res)
114-
return res
108+
return &PackageManager{
109+
log: pmb.log,
110+
packages: pmb.packages,
111+
IndexDir: pmb.IndexDir,
112+
PackagesDir: pmb.PackagesDir,
113+
DownloadDir: pmb.DownloadDir,
114+
tempDir: pmb.tempDir,
115+
packagesCustomGlobalProperties: pmb.packagesCustomGlobalProperties,
116+
profile: pmb.profile,
117+
discoveryManager: pmb.discoveryManager,
118+
userAgent: pmb.userAgent,
119+
}
115120
}
116121

117122
// NewBuilder creates a Builder with the same configuration

0 commit comments

Comments
 (0)