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

builder/amazon: prefer token in config [GH-1544]

This commit is contained in:
Mitchell Hashimoto 2014-10-27 17:29:40 -07:00
parent 1fa95d7153
commit 4406c20af1
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -16,6 +16,7 @@ IMPROVEMENTS:
BUG FIXES: BUG FIXES:
* core: Fix loading plugins from pwd. [GH-1521] * core: Fix loading plugins from pwd. [GH-1521]
* builder/amazon: Prefer token in config if given. [GH-1544]
* builder/virtualbox: Can read VirtualBox version on FreeBSD. [GH-1570] * builder/virtualbox: Can read VirtualBox version on FreeBSD. [GH-1570]
* builder/virtualbox: More robust reading of guest additions URL. [GH-1509] * builder/virtualbox: More robust reading of guest additions URL. [GH-1509]
* builder/vmware: Always remove floppies/drives. [GH-1504] * builder/vmware: Always remove floppies/drives. [GH-1504]

2
builder/amazon/common/access_config.go
View File

@ -26,7 +26,7 @@ func (c *AccessConfig) Auth() (aws.Auth, error) {
c.SecretKey = auth.SecretKey c.SecretKey = auth.SecretKey
c.Token = auth.Token c.Token = auth.Token
} }
if auth.Token == "" && c.Token != "" { if c.Token != "" {
auth.Token = c.Token auth.Token = c.Token
} }