cmd/juju/status.go - Issue 7327050: state: Machine.InstanceId returns bool

Keyboard Shortcuts

	File
u :	up to issue
m :	publish + mail comments
M :	edit review message
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line
<Enter> :	respond to / edit current comment
d :	mark current comment as done

	Issue
u :	up to list of issues
m :	publish + mail comments
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue
# :	close issue

	Comment/message editing
<Ctrl> + s or <Ctrl> + Enter :	save comment
<Esc> :	cancel edit

Unified Diff: cmd/juju/status.go

Issue 7327050: state: Machine.InstanceId returns bool

Patch Set: state: Machine.InstanceId returns bool Created 12 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Please Sign in to add in-line comments.

Jump to:

Index: cmd/juju/status.go

=== modified file 'cmd/juju/status.go'

--- cmd/juju/status.go 2013-01-09 16:13:31 +0000

+++ cmd/juju/status.go 2013-02-18 16:33:11 +0000

@@ -117,13 +117,11 @@

func processMachines(machines map[string]*state.Machine, instances map[state.InstanceId]environs.Instance) (map[string]interface{}, error) {

r := make(map[string]interface{})

for _, m := range machines {

- instid, err := m.InstanceId()

- if err, ok := err.(*state.NotFoundError); ok {

+ instid, ok := m.InstanceId()

+ if !ok {

r[m.Id()] = map[string]interface{}{

"instance-id": "pending",

}

- } else if err != nil {

- return nil, err

} else {

instance, ok := instances[instid]

if !ok {

« no previous file with comments | « cmd/juju/ssh_test.go ('k') | cmd/jujud/bootstrap_test.go » ('j') | no next file with comments »