1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
|
diff -U 3 -r --no-dereference ./2.0.0/.unpacked-clean/src/github.com/juju/juju/apiserver/charms.go ./2.0.0/src/github.com/juju/juju/apiserver/charms.go
--- ./2.0.0/.unpacked-clean/src/github.com/juju/juju/apiserver/charms.go 2016-10-13 14:31:49.000000000 +0000
+++ ./2.0.0/src/github.com/juju/juju/apiserver/charms.go 2016-11-03 15:55:24.773085965 +0000
@@ -284,7 +284,8 @@
if isImporting, err := modelIsImporting(st); err != nil {
return nil, errors.Trace(err)
} else if !isImporting {
- return nil, errors.New("cs charms may only be uploaded during model migration import")
+ // fake-juju allows uploading "charmstore" charms.
+ //return nil, errors.New("cs charms may only be uploaded during model migration import")
}
// If a revision argument is provided, it takes precedence
Only in ./2.0.0/src/github.com/juju/juju/apiserver: charms.go~
diff -U 3 -r --no-dereference ./2.0.0/.unpacked-clean/src/github.com/juju/juju/provider/dummy/environs.go ./2.0.0/src/github.com/juju/juju/provider/dummy/environs.go
--- ./2.0.0/.unpacked-clean/src/github.com/juju/juju/provider/dummy/environs.go 2016-10-13 14:31:49.000000000 +0000
+++ ./2.0.0/src/github.com/juju/juju/provider/dummy/environs.go 2016-11-03 13:52:34.827516374 +0000
@@ -643,9 +643,9 @@
// PrecheckInstance is specified in the state.Prechecker interface.
func (*environ) PrecheckInstance(series string, cons constraints.Value, placement string) error {
- if placement != "" && placement != "valid" {
- return fmt.Errorf("%s placement is invalid", placement)
- }
+// if placement != "" && placement != "valid" {
+// return fmt.Errorf("%s placement is invalid", placement)
+// }
return nil
}
diff -U 3 -r --no-dereference ./2.0.0/.unpacked-clean/src/github.com/juju/juju/testcharms/charm.go ./2.0.0/src/github.com/juju/juju/testcharms/charm.go
--- ./2.0.0/.unpacked-clean/src/github.com/juju/juju/testcharms/charm.go 2016-10-13 14:31:49.000000000 +0000
+++ ./2.0.0/src/github.com/juju/juju/testcharms/charm.go 2016-11-03 13:52:34.827516374 +0000
@@ -17,7 +17,9 @@
)
// Repo provides access to the test charm repository.
-var Repo = testing.NewRepo("charm-repo", "quantal")
+// XXX fake-juju: avoid crashing because the charm-repo dir is not there
+//var Repo = testing.NewRepo("charm-repo", "quantal")
+var Repo = &testing.Repo{}
// UploadCharmWithMeta pushes a new charm to the charmstore.
// The uploaded charm takes the supplied charmURL with metadata.yaml and metrics.yaml
diff -U 3 -r --no-dereference ./2.0.0/.unpacked-clean/src/github.com/juju/juju/testing/cert.go ./2.0.0/src/github.com/juju/juju/testing/cert.go
--- ./2.0.0/.unpacked-clean/src/github.com/juju/juju/testing/cert.go 2016-10-13 14:31:49.000000000 +0000
+++ ./2.0.0/src/github.com/juju/juju/testing/cert.go 2016-11-03 13:52:34.827516374 +0000
@@ -52,7 +52,7 @@
}
func mustNewCA() (string, string) {
- cert.KeyBits = 512
+ cert.KeyBits = 1024
caCert, caKey, err := cert.NewCA("juju testing", "1234-ABCD-IS-NOT-A-REAL-UUID", time.Now().AddDate(10, 0, 0))
if err != nil {
panic(err)
@@ -61,7 +61,7 @@
}
func mustNewServer() (string, string) {
- cert.KeyBits = 512
+ cert.KeyBits = 1024
var hostnames []string
srvCert, srvKey, err := cert.NewServer(CACert, CAKey, time.Now().AddDate(10, 0, 0), hostnames)
if err != nil {
|