From ce461733d338984b1e76b51feab84551e343d538 Mon Sep 17 00:00:00 2001 From: Cosmin Cojocar Date: Thu, 23 Aug 2018 09:54:12 +0200 Subject: [PATCH] Keep the old Build signature in order to not break the public API Signed-off-by: Cosmin Cojocar --- cmd/helm/dependency_build.go | 3 +-- pkg/downloader/manager.go | 11 ++++++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/cmd/helm/dependency_build.go b/cmd/helm/dependency_build.go index c69be69ec..a164dcef5 100644 --- a/cmd/helm/dependency_build.go +++ b/cmd/helm/dependency_build.go @@ -87,6 +87,5 @@ func (d *dependencyBuildCmd) run() error { if d.recursive { return man.BuildRecursively() } - _, err := man.Build() - return err + return man.Build() } diff --git a/pkg/downloader/manager.go b/pkg/downloader/manager.go index a9d044512..0f4e7b9c0 100644 --- a/pkg/downloader/manager.go +++ b/pkg/downloader/manager.go @@ -66,7 +66,12 @@ type Manager struct { // If the lockfile is not present, this will run a Manager.Update() // // If SkipUpdate is set, this will not update the repository. -func (m *Manager) Build() ([]*chartutil.Dependency, error) { +func (m *Manager) Build() error { + _, err := m.build() + return err +} + +func (m *Manager) build() ([]*chartutil.Dependency, error) { c, err := m.loadChartDir() if err != nil { return nil, err @@ -121,7 +126,7 @@ func (m *Manager) Build() ([]*chartutil.Dependency, error) { // If SkipUpdate is set, this will not update the repository. func (m *Manager) BuildRecursively() error { // Build the main chart - dependencies, err := m.Build() + dependencies, err := m.build() if err != nil { return err } @@ -152,7 +157,7 @@ func (m *Manager) BuildRecursively() error { for _, dep := range currChartDep.deps { chartPath := filepath.Join(currChartDep.path, dep.Name) m.ChartPath = chartPath - newDeps, err := m.Build() + newDeps, err := m.build() if err != nil { return err }