upstream/helm
1
0
Fork 0
mirror of https://github.com/helm/helm.git synced 2026-03-10 18:32:08 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 14

Merge pull request #736 from technosophos/fix/672-package-output

Browse source 
fix(helm): fix output of helm package command
This commit is contained in:
Matt Butcher 2016-05-20 13:40:21 -06:00
commit 53432c2cef
2 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
cmd/helm/package.go
View file

@ -54,21 +54,25 @@ func runPackage(cmd *cobra.Command, args []string) error {
return err
}
// Save to $HELM_HOME/local directory.
if save {
if err := repo.AddChartToLocalRepo(ch, localRepoDirectory()); err != nil {
return err
}
}
// Save to the current working directory.
cwd, err := os.Getwd()
if err != nil {
return err
}
name, err := chart.Save(ch, cwd)
if err == nil {
if err == nil && flagVerbose {
cmd.Printf("Saved %s to current directory\n", name)
}
// Save to $HELM_HOME/local directory. This is second, because we don't want
// the case where we saved here, but didn't save to the default destination.
if save {
if err := repo.AddChartToLocalRepo(ch, localRepoDirectory()); err != nil {
return err
} else if flagVerbose {
cmd.Printf("Saved %s to %s\n", name, localRepoDirectory())
}
}
return err
}

3
pkg/repo/local.go
View file

@ -43,7 +43,7 @@ func serveFile(w http.ResponseWriter, r *http.Request, file string) {
// AddChartToLocalRepo saves a chart in the given path and then reindexes the index file
func AddChartToLocalRepo(ch *chart.Chart, path string) error {
name, err := chart.Save(ch, path)
_, err := chart.Save(ch, path)
if err != nil {
return err
}
@ -51,7 +51,6 @@ func AddChartToLocalRepo(ch *chart.Chart, path string) error {
if err != nil {
return err
}
fmt.Printf("Saved %s to $HELM_HOME/local", name)
return nil
}