← Back to branch summary

~cmars/juju-core/local-repo-errmsg

« back to all changes in this revision

Viewing changes to worker/uniter/charm/charm.go

  • Committer: Tim Penhey
  • Date: 2013-04-14 22:12:49 UTC
  • mto: (1142.2.6 string-set)
  • mto: This revision was merged to the branch mainline in revision 1152.
  • Revision ID: tim.penhey@canonical.com-20130414221249-tk8f6emctl1f8w63
Trivial rename of trivial -> utils.

Show diffs side-by-side

added added

removed removed

Lines of Context:
worker/uniter/charm/charm.go
9
9
        "launchpad.net/juju-core/downloader"
10
10
        "launchpad.net/juju-core/log"
11
11
        "launchpad.net/juju-core/state"
12
 
        "launchpad.net/juju-core/trivial"
 
12
        "launchpad.net/juju-core/utils"
13
13
        "os"
14
14
        "path"
15
15
)
44
44
// hash, then copies it into the directory. If a value is received on abort, the
45
45
// download will be stopped.
46
46
func (d *BundlesDir) download(sch *state.Charm, abort <-chan struct{}) (err error) {
47
 
        defer trivial.ErrorContextf(&err, "failed to download charm %q from %q", sch.URL(), sch.BundleURL())
 
47
        defer utils.ErrorContextf(&err, "failed to download charm %q from %q", sch.URL(), sch.BundleURL())
48
48
        dir := d.downloadsPath()
49
49
        if err := os.MkdirAll(dir, 0755); err != nil {
50
50
                return err