| Index: worker/uniter/modes.go |
| === modified file 'worker/uniter/modes.go' |
| --- worker/uniter/modes.go 2013-05-31 01:02:53 +0000 |
| +++ worker/uniter/modes.go 2013-06-15 08:59:49 +0000 |
| @@ -353,7 +353,7 @@ |
| default: |
| return nil, fmt.Errorf("unknown resolved mode %q", rm) |
| } |
| - if e := u.unit.ClearResolved(); e != nil { |
| + if e := u.f.ClearResolved(); e != nil { |
| return nil, e |
| } |
| if err == errHookFailed { |
| @@ -386,7 +386,7 @@ |
| return nil, tomb.ErrDying |
| case <-u.f.ResolvedEvents(): |
| err = u.charm.Snapshotf("Upgrade conflict resolved.") |
| - if e := u.unit.ClearResolved(); e != nil { |
| + if e := u.f.ClearResolved(); e != nil { |
| return nil, e |
| } |
| if err != nil { |
