Index: cmd/jujud/upgrade.go |
=== modified file 'cmd/jujud/upgrade.go' |
--- cmd/jujud/upgrade.go 2013-03-25 15:34:57 +0000 |
+++ cmd/jujud/upgrade.go 2013-04-11 17:51:37 +0000 |
@@ -47,7 +47,7 @@ |
if err != nil { |
return err |
} |
- log.Infof("cmd/jujud: upgrader upgraded from %v to %v (%q)", e.OldTools.Binary, tools.Binary, tools.URL) |
+ log.Infof("upgrader upgraded from %v to %v (%q)", e.OldTools.Binary, tools.Binary, tools.URL) |
return nil |
} |
@@ -95,7 +95,7 @@ |
// Don't abort everything because we can't find the tools directory. |
// The problem should sort itself out as we will immediately |
// download some more tools and upgrade. |
- log.Warningf("cmd/jujud: upgrader cannot read current tools: %v", err) |
+ log.Warningf("upgrader cannot read current tools: %v", err) |
currentTools = &state.Tools{ |
Binary: version.Current, |
} |
@@ -146,13 +146,13 @@ |
if environ == nil { |
environ, err = environs.New(cfg) |
if err != nil { |
- log.Errorf("cmd/jujud: upgrader loaded invalid initial environment configuration: %v", err) |
+ log.Errorf("upgrader loaded invalid initial environment configuration: %v", err) |
break |
} |
} else { |
err = environ.SetConfig(cfg) |
if err != nil { |
- log.Warningf("cmd/jujud: upgrader loaded invalid environment configuration: %v", err) |
+ log.Warningf("upgrader loaded invalid environment configuration: %v", err) |
// continue on, because the version number is still significant. |
} |
} |
@@ -188,7 +188,7 @@ |
} |
tools, err := environs.FindTools(environ, binary, flags) |
if err != nil { |
- log.Errorf("cmd/jujud: upgrader error finding tools for %v: %v", binary, err) |
+ log.Errorf("upgrader error finding tools for %v: %v", binary, err) |
noDelay() |
// TODO(rog): poll until tools become available. |
break |
@@ -196,18 +196,18 @@ |
if tools.Binary != binary { |
if tools.Number == version.Current.Number { |
// TODO(rog): poll until tools become available. |
- log.Warningf("cmd/jujud: upgrader: version %v requested but found only current version: %v", binary, tools.Number) |
+ log.Warningf("upgrader: version %v requested but found only current version: %v", binary, tools.Number) |
noDelay() |
break |
} |
- log.Warningf("cmd/jujud: upgrader cannot find exact tools match for %s; using %s instead", binary, tools.Binary) |
+ log.Warningf("upgrader cannot find exact tools match for %s; using %s instead", binary, tools.Binary) |
} |
if tools, err := agent.ReadTools(u.dataDir, tools.Binary); err == nil { |
// The best available tools have already been downloaded, so use them. |
return u.upgradeReady(currentTools, tools) |
} |
- log.Infof("cmd/jujud: upgrader downloading %q", tools.URL) |
+ log.Infof("upgrader downloading %q", tools.URL) |
download = downloader.New(tools.URL, "") |
downloadTools = tools |
downloadDone = download.Done() |
@@ -215,17 +215,17 @@ |
tools := downloadTools |
download, downloadTools, downloadDone = nil, nil, nil |
if status.Err != nil { |
- log.Errorf("cmd/jujud: upgrader download of %v failed: %v", tools.Binary, status.Err) |
+ log.Errorf("upgrader download of %v failed: %v", tools.Binary, status.Err) |
noDelay() |
break |
} |
err := agent.UnpackTools(u.dataDir, tools, status.File) |
status.File.Close() |
if err := os.Remove(status.File.Name()); err != nil { |
- log.Warningf("cmd/jujud: upgrader cannot remove temporary download file: %v", err) |
+ log.Warningf("upgrader cannot remove temporary download file: %v", err) |
} |
if err != nil { |
- log.Errorf("cmd/jujud: upgrader cannot unpack %v tools: %v", tools.Binary, err) |
+ log.Errorf("upgrader cannot unpack %v tools: %v", tools.Binary, err) |
noDelay() |
break |
} |