~rogpeppe/juju-core/057-uniter-upgrade

« back to all changes in this revision

Viewing changes to cmd/jujud/unit.go

  • Committer: Roger Peppe
  • Date: 2012-09-14 17:03:55 UTC
  • Revision ID: roger.peppe@canonical.com-20120914170355-3kxrlksy173d7swt
cmd/jujud: update uniter for no error return

Show diffs side-by-side

added added

removed removed

Lines of Context:
82
82
        if err != nil {
83
83
                return nil, err
84
84
        }
85
 
        u, err := uniter.NewUniter(st, unit.Name(), a.Conf.DataDir)
86
 
        if err != nil {
87
 
                return nil, err
88
 
        }
89
85
        return unit, runTasks(a.tomb.Dying(),
90
 
                u,
 
86
                uniter.NewUniter(st, unit.Name(), a.Conf.DataDir),
91
87
                NewUpgrader(st, unit, a.Conf.DataDir),
92
88
        )
93
89
}