← Back to branch summary

~juju-qa/ubuntu/xenial/juju/xenial-2.0-beta3

« back to all changes in this revision

Viewing changes to src/github.com/juju/juju/cmd/supercommand.go

  • Committer: Martin Packman
  • Date: 2016-03-30 19:31:08 UTC
  • mfrom: (1.1.41)
  • Revision ID: martin.packman@canonical.com-20160330193108-h9iz3ak334uk0z5r
Merge new upstream source 2.0~beta3

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/github.com/juju/juju/cmd/supercommand.go
9
9
        "github.com/juju/loggo"
10
10
        "github.com/juju/utils/arch"
11
11
        "github.com/juju/utils/series"
 
12
        "github.com/juju/version"
12
13
 
13
14
        "github.com/juju/juju/juju/osenv"
14
 
        "github.com/juju/juju/version"
 
15
        jujuversion "github.com/juju/juju/version"
15
16
)
16
17
 
17
18
func init() {
35
36
                DefaultConfig: os.Getenv(osenv.JujuLoggingConfigEnvKey),
36
37
        }
37
38
        current := version.Binary{
38
 
                Number: version.Current,
 
39
                Number: jujuversion.Current,
39
40
                Arch:   arch.HostArch(),
40
41
                Series: series.HostSeries(),
41
42
        }
56
57
}
57
58
 
58
59
func runNotifier(name string) {
59
 
        logger.Infof("running %s [%s %s %s]", name, version.Current, runtime.Compiler, runtime.Version())
 
60
        logger.Infof("running %s [%s %s %s]", name, jujuversion.Current, runtime.Compiler, runtime.Version())
60
61
}