Merge lp:~niemeyer/juju-core/mstate-update-mgo into lp:~juju/juju-core/trunk

[Gustavo Niemeyer]

mstate: update mgo API to r2012.06.22

https://codereview.appspot.com/6330045/

[Gustavo Niemeyer (niemeyer)]

Reviewers: mp+111547_code.launchpad.net,

Message:
Please take a look.

Description:
mstate: update mgo API to r2012.06.22

https://code.launchpad.net/~niemeyer/juju-core/mstate-update-mgo/+merge/111547

(do not edit description out of merge proposal)

Please review this at https://codereview.appspot.com/6330045/

Affected files:
   A [revision details]
   M mstate/sequence.go
   M mstate/state.go

Index: [revision details]
=== added file '[revision details]'
--- [revision details] 2012-01-01 00:00:00 +0000
+++ [revision details] 2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision: <email address hidden>
+New revision: <email address hidden>

Index: mstate/sequence.go
=== modified file 'mstate/sequence.go'
--- mstate/sequence.go 2012-06-21 08:28:16 +0000
+++ mstate/sequence.go 2012-06-22 06:30:54 +0000
@@ -18,7 +18,7 @@
    Upsert: true,
   }
   result := &sequenceDoc{}
- err := query.Modify(inc, result)
+ _, err := query.Apply(inc, result)
   if err != nil {
    return -1, fmt.Errorf("can't increment %q sequence number: %v", name,
err)
   }

Index: mstate/state.go
=== modified file 'mstate/state.go'
--- mstate/state.go 2012-06-21 08:28:16 +0000
+++ mstate/state.go 2012-06-22 06:30:54 +0000
@@ -56,9 +56,6 @@
  func (s *State) Machine(id int) (*Machine, error) {
   mdoc := &machineDoc{}
   err := s.machines.Find(bson.D{{"_id", id}}).One(mdoc)
- if err == mgo.NotFound {
- return nil, fmt.Errorf("machine %d not found", id)
- }
   if err != nil {
    return nil, fmt.Errorf("can't get machine %d: %v", id, err)
   }

[Roger Peppe (rogpeppe)]

On 2012/06/22 06:35:06, niemeyer wrote:
> Please take a look.

LGTM

https://codereview.appspot.com/6330045/

[Gustavo Niemeyer (niemeyer)]

This has been submitted in another CL because Launchpad/bzr were badly
broken somehow.

https://codereview.appspot.com/6330045/