Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
P
packer
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kristopher Ruzic
packer
Commits
d2d4ce77
Commit
d2d4ce77
authored
9 years ago
by
Chris Bednarski
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #2561 from mitchellh/b-govet
Fix govet issues
parents
af2fa705
eb5482cb
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
5 additions
and
10 deletions
+5
-10
builder/amazon/common/artifact.go
builder/amazon/common/artifact.go
+1
-1
builder/amazon/common/state.go
builder/amazon/common/state.go
+0
-2
builder/openstack/server.go
builder/openstack/server.go
+0
-2
packer/rpc/server.go
packer/rpc/server.go
+4
-4
provisioner/windows-restart/provisioner.go
provisioner/windows-restart/provisioner.go
+0
-1
No files found.
builder/amazon/common/artifact.go
View file @
d2d4ce77
...
...
@@ -88,7 +88,7 @@ func (a *Artifact) Destroy() error {
if
len
(
errors
)
==
1
{
return
errors
[
0
]
}
else
{
return
&
packer
.
MultiError
{
errors
}
return
&
packer
.
MultiError
{
Errors
:
errors
}
}
}
...
...
This diff is collapsed.
Click to expand it.
builder/amazon/common/state.go
View file @
d2d4ce77
...
...
@@ -181,8 +181,6 @@ func WaitForState(conf *StateChangeConf) (i interface{}, err error) {
time
.
Sleep
(
time
.
Duration
(
sleepSeconds
)
*
time
.
Second
)
}
return
}
func
isTransientNetworkError
(
err
error
)
bool
{
...
...
This diff is collapsed.
Click to expand it.
builder/openstack/server.go
View file @
d2d4ce77
...
...
@@ -92,6 +92,4 @@ func WaitForState(conf *StateChangeConf) (i interface{}, err error) {
log
.
Printf
(
"Waiting for state to become: %s currently %s (%d%%)"
,
conf
.
Target
,
currentState
,
currentProgress
)
time
.
Sleep
(
2
*
time
.
Second
)
}
return
}
This diff is collapsed.
Click to expand it.
packer/rpc/server.go
View file @
d2d4ce77
package
rpc
import
(
"fmt"
"github.com/hashicorp/go-msgpack/codec"
"github.com/mitchellh/packer/packer"
"io"
"log"
"net/rpc"
"sync/atomic"
"github.com/hashicorp/go-msgpack/codec"
"github.com/mitchellh/packer/packer"
)
var
endpointId
uint64
...
...
@@ -149,7 +149,7 @@ func (s *Server) Serve() {
func
registerComponent
(
server
*
rpc
.
Server
,
name
string
,
rcvr
interface
{},
id
bool
)
string
{
endpoint
:=
name
if
id
{
fmt
.
Sp
rintf
(
"%s.%d"
,
endpoint
,
atomic
.
AddUint64
(
&
endpointId
,
1
))
log
.
P
rintf
(
"%s.%d"
,
endpoint
,
atomic
.
AddUint64
(
&
endpointId
,
1
))
}
server
.
RegisterName
(
endpoint
,
rcvr
)
...
...
This diff is collapsed.
Click to expand it.
provisioner/windows-restart/provisioner.go
View file @
d2d4ce77
...
...
@@ -134,7 +134,6 @@ WaitLoop:
case
<-
p
.
cancel
:
close
(
waitDone
)
return
fmt
.
Errorf
(
"Interrupt detected, quitting waiting for machine to restart"
)
break
WaitLoop
}
}
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment