iSharkFly-Docs
/
packer-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

undo portions of general stupidity I have done.

This commit is contained in:
Olivier Tremblay 2015-08-20 07:41:02 -04:00
parent f301a6454d
commit 839f051d93
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
common/packer_config.go
View File

@ -4,10 +4,9 @@ package common
// are sent by packer, properly tagged already so mapstructure can load // are sent by packer, properly tagged already so mapstructure can load
// them. Embed this structure into your configuration class to get it. // them. Embed this structure into your configuration class to get it.
type PackerConfig struct { type PackerConfig struct {
PackerBuildName string `mapstructure:"packer_build_name"` PackerBuildName string `mapstructure:"packer_build_name"`
PackerBuilderType string `mapstructure:"packer_builder_type"` PackerBuilderType string `mapstructure:"packer_builder_type"`
PackerDebug bool `mapstructure:"packer_debug"` PackerDebug bool `mapstructure:"packer_debug"`
PackerForce bool `mapstructure:"packer_force"` PackerForce bool `mapstructure:"packer_force"`
PackerUserVars map[string]string `mapstructure:"packer_user_variables"` PackerUserVars map[string]string `mapstructure:"packer_user_variables"`
PackerIsoTargetPath string `mapstructure:"packer_iso_target_path"`
} }

2
common/step_download.go
View File

@ -71,7 +71,7 @@ func (s *StepDownload) Run(state multistep.StateBag) multistep.StepAction {
// if we force a certain extension we hash the URL and add // if we force a certain extension we hash the URL and add
// the extension to force it. // the extension to force it.
cacheKey := url cacheKey := url
if s.Extension != "" { //HERE. if s.Extension != "" {
hash := sha1.Sum([]byte(url)) hash := sha1.Sum([]byte(url))
cacheKey = fmt.Sprintf( cacheKey = fmt.Sprintf(
"%s.%s", hex.EncodeToString(hash[:]), s.Extension) "%s.%s", hex.EncodeToString(hash[:]), s.Extension)