← Back to branch summary

~ubuntu-branches/ubuntu/trusty/juju-core/trusty-proposed

« back to all changes in this revision

Viewing changes to src/launchpad.net/juju-core/worker/provisioner/provisioner_task.go

  • Committer: Package Import Robot
  • Author(s): James Page
  • Date: 2014-01-29 11:40:20 UTC
  • mfrom: (23.1.1 trusty-proposed)
  • Revision ID: package-import@ubuntu.com-20140129114020-ejieitm8smtt5vln
Tags: 1.17.1-0ubuntu2
d/tests/local-provider: Don't fail tests if ~/.juju is present as its
created by the juju version command. 

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/launchpad.net/juju-core/worker/provisioner/provisioner_task.go
51
51
        machineGetter MachineGetter,
52
52
        watcher Watcher,
53
53
        broker environs.InstanceBroker,
54
 
        auth AuthenticationProvider,
 
54
        auth environs.AuthenticationProvider,
55
55
) ProvisionerTask {
56
56
        task := &provisionerTask{
57
57
                machineTag:     machineTag,
76
76
        machineWatcher Watcher
77
77
        broker         environs.InstanceBroker
78
78
        tomb           tomb.Tomb
79
 
        auth           AuthenticationProvider
 
79
        auth           environs.AuthenticationProvider
80
80
 
81
81
        safeMode     bool
82
82
        safeModeChan chan bool
244
244
                machineTag := names.MachineTag(id)
245
245
                machine, err := task.machineGetter.Machine(machineTag)
246
246
                switch {
247
 
                case params.IsCodeNotFound(err):
 
247
                case params.IsCodeNotFoundOrCodeUnauthorized(err):
248
248
                        logger.Debugf("machine %q not found in state", id)
249
249
                        delete(task.machines, id)
250
250
                case err == nil:
316
316
        }
317
317
 
318
318
        for _, m := range task.machines {
319
 
                if instId, err := m.InstanceId(); err == nil {
 
319
                instId, err := m.InstanceId()
 
320
                switch {
 
321
                case err == nil:
320
322
                        delete(instances, instId)
321
 
                } else if !params.IsCodeNotProvisioned(err) && !params.IsCodeNotFound(err) {
 
323
                case params.IsCodeNotProvisioned(err):
 
324
                case params.IsCodeNotFoundOrCodeUnauthorized(err):
 
325
                default:
322
326
                        return nil, err
323
327
                }
324
328
        }