Issue 61990043: Fix the key we are looking for.

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

Issue 61990043: Fix the key we are looking for.

Can't Edit
Can't Publish+Mail
Start Review

Created:
10 years, 3 months ago by thumper

Modified:
10 years, 3 months ago

Reviewers:
mp+205864, wallyworld

Visibility:
Public.

Description

Fix the key we are looking for. We were looking for the wrong key to determine whether to write system files or not. https://code.launchpad.net/~thumper/juju-core/fix-provider-query-in-machine-env-worker/+merge/205864 (do not edit description out of merge proposal)

Patch Set 1 #

Patch Set 2 : Fix the key we are looking for. #

Total comments: 2

Created: 10 years, 3 months ago

Download [raw] [tar.bz2]

	Unified diffs	Side-by-side diffs	Delta from patch set	Stats (+18 lines, -15 lines)			Patch
A	[revision details]	View	1	1 chunk	+2 lines, -0 lines	0 comments	Download
M	agent/format-1.16.go	View	1	2 chunks	+8 lines, -8 lines	0 comments	Download
M	agent/format-1.16_whitebox_test.go	View	1	2 chunks	+5 lines, -5 lines	0 comments	Download
M	worker/machineenvironmentworker/machineenvironmentworker.go	View		1 chunk	+2 lines, -1 line	2 comments	Download
M	worker/machineenvironmentworker/machineenvironmentworker_test.go	View	1	1 chunk	+1 line, -1 line	0 comments	Download

Messages

Total messages: 5

Expand All Messages | Collapse All Messages

thumper

On 2014/02/11 22:50:36, thumper wrote: > Please take a look. Please wait, I have a ...

10 years, 3 months ago (2014-02-12 05:17:02 UTC) #2

wallyworld

LGTM https://codereview.appspot.com/61990043/diff/20001/worker/machineenvironmentworker/machineenvironmentworker.go File worker/machineenvironmentworker/machineenvironmentworker.go (right): https://codereview.appspot.com/61990043/diff/20001/worker/machineenvironmentworker/machineenvironmentworker.go#newcode69 worker/machineenvironmentworker/machineenvironmentworker.go:69: agentConfig.Value(agent.ProviderType) == provider.Local) I still wish this were ...

10 years, 3 months ago (2014-02-12 23:04:44 UTC) #4

thumper

10 years, 3 months ago (2014-02-13 00:39:17 UTC) #5

https://codereview.appspot.com/61990043/diff/20001/worker/machineenvironmentw...
File worker/machineenvironmentworker/machineenvironmentworker.go (right):

https://codereview.appspot.com/61990043/diff/20001/worker/machineenvironmentw...
worker/machineenvironmentworker/machineenvironmentworker.go:69:
agentConfig.Value(agent.ProviderType) == provider.Local)
On 2014/02/12 23:04:45, wallyworld wrote:
> I still wish this were
> 
> writeSystemFiles := agentConfig.Tag() != names.MachineTag("0") ||
> agentConfig.Value(agent.JujuProviderType) != provider.Local
> 
> much easier to parse and no brackets

Done.

Expand All Messages | Collapse All Messages