← Back to branch summary

~rogpeppe/juju-core/492-sshinit-log-stdout

« back to all changes in this revision

Viewing changes to agent/diskmanager.go

  • Committer: John Arbash Meinel
  • Date: 2013-07-09 11:31:00 UTC
  • mto: (1384.3.6 upgrader-api-worker)
  • mto: This revision was merged to the branch mainline in revision 1419.
  • Revision ID: john@arbash-meinel.com-20130709113100-2mira0ti15p5nm67
Turn environs/agent into a top level agent/ package.

Show diffs side-by-side

added added

removed removed

Lines of Context:
agent/diskmanager.go
6
6
import (
7
7
        "io"
8
8
 
9
 
        "launchpad.net/juju-core/environs/agent"
10
9
        "launchpad.net/juju-core/state"
11
10
        "launchpad.net/juju-core/version"
12
11
)
23
22
        return &DiskManager{dataDir: dataDir}
24
23
}
25
24
 
26
 
// For now, everything is just proxied from environs/agent. But really tool
27
 
// handling should be independent of anything in environs.
28
 
 
29
25
func (d *DiskManager) ReadTools(vers version.Binary) (*Tools, error) {
30
 
        stTools, err := agent.ReadTools(d.dataDir, vers)
 
26
        stTools, err := ReadTools(d.dataDir, vers)
31
27
        return (*Tools)(stTools), err
32
28
}
33
29
 
34
30
func (d *DiskManager) UnpackTools(tools *Tools, r io.Reader) error {
35
 
        return agent.UnpackTools(d.dataDir, (*state.Tools)(tools), r)
 
31
        return UnpackTools(d.dataDir, (*state.Tools)(tools), r)
36
32
}
37
33
 
38
34
func (d *DiskManager) SharedToolsDir(vers version.Binary) string {
39
 
        return agent.SharedToolsDir(d.dataDir, vers)
 
35
        return SharedToolsDir(d.dataDir, vers)
40
36
}