78
78
// We won't "wait" actually, because the environ is already
79
79
// available and has a guaranteed valid config, but until
80
80
// WaitForEnviron goes away, this code needs to stay.
81
fw.environ, err = environ.WaitForEnviron(fw.modelWatcher, fw.st, fw.catacomb.Dying())
81
fw.environ, err = environ.WaitForEnviron(fw.modelWatcher, fw.st, environs.New, fw.catacomb.Dying())
83
83
if err == environ.ErrWaitAborted {
84
84
return fw.catacomb.ErrDying()