← Back to branch summary

~free.ekanayaka/fake-juju/leverage-dh-python

« back to all changes in this revision

Viewing changes to patches/juju-core_2.0.0.patch

  • Committer: Landscape Builder
  • Author(s): Francis Ginther
  • Date: 2016-11-21 15:30:03 UTC
  • mfrom: (56.1.2 fix-i386-builds)
  • Revision ID: landscape_builder-20161121153003-erxqmug86n8ksgyl
Merge fix-i386-builds [f=] [r=ericsnowcurrently,landscape-builder] [a=Francis Ginther]
Add a 2.0.0 patch for integer overflow error, https://github.com/go-mgo/mgo/pull/311.

Show diffs side-by-side

added added

removed removed

Lines of Context:
patches/juju-core_2.0.0.patch
63
63
        var hostnames []string
64
64
        srvCert, srvKey, err := cert.NewServer(CACert, CAKey, time.Now().AddDate(10, 0, 0), hostnames)
65
65
        if err != nil {
 
66
diff -U 3 -r --no-dereference ./2.0.0/.unpacked-clean/src/gopkg.in/mgo.v2/bson/json.go ./2.0.0/src/gopkg.in/mgo.v2/bson/json.go
 
67
--- ./2.0.0/.unpacked-clean/src/gopkg.in/mgo.v2/bson/json.go    2016-10-13 09:32:16.000000000 -0500
 
68
+++ ./2.0.0/src/gopkg.in/mgo.v2/bson/json.go    2016-11-21 07:55:31.696036251 -0600
 
69
@@ -317,7 +317,8 @@
 
70
 func jencInt(v interface{}) ([]byte, error) {
 
71
        n := v.(int)
 
72
        f := `{"$numberLong":"%d"}`
 
73
-       if n <= 1<<53 {
 
74
+       // fake-juju apply https://github.com/go-mgo/mgo/pull/311
 
75
+       if int64(n) <= 1<<53 {
 
76
                f = `%d`
 
77
        }
 
78
        return fbytes(f, n), nil