Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitaly.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Plum <jplum@gitlab.com>2019-02-13 16:46:06 +0300
committerJason Plum <jplum@gitlab.com>2019-02-13 17:00:17 +0300
commit4ba68ba50bdf2858783d1eec0f0dbc411fbdf74f (patch)
treeac78032f28a11346eecc62eff80ad52466fa7a18 /_support
parentfd6408793d9fddd36ad4c78fd3dce5800058c9a0 (diff)
makegen.go updates per feedback
Stylistic changes to messages from `VersionFrom*` methods.
Diffstat (limited to '_support')
-rw-r--r--_support/makegen.go9
1 files changed, 4 insertions, 5 deletions
diff --git a/_support/makegen.go b/_support/makegen.go
index fe7432fe8..4a71870ab 100644
--- a/_support/makegen.go
+++ b/_support/makegen.go
@@ -148,8 +148,7 @@ func (gm *gitalyMake) GoLdFlags() string {
func (gm *gitalyMake) VersionFromFile() string {
data, err := ioutil.ReadFile("../VERSION")
if err != nil {
- log.Printf("Error: %v", err)
- log.Printf("Unable to obtain version from VERSION file.")
+ log.Printf("error obtaining version from file: %v", err)
return ""
}
@@ -161,7 +160,7 @@ func (gm *gitalyMake) VersionFromGit() string {
cmd.Stderr = os.Stderr
out, err := cmd.Output()
if err != nil {
- log.Printf("%s: %v", strings.Join(cmd.Args, " "), err)
+ log.Printf("error obtaining version from git: %s: %v", strings.Join(cmd.Args, " "), err)
return ""
}
@@ -175,14 +174,14 @@ func (gm *gitalyMake) VersionPrefixed() string {
version := gm.VersionFromGit()
if version == "" {
- log.Printf("Unable to determine version from Git. Attempting VERSION file")
+ log.Printf("Attempting to get the version from file")
version = gm.VersionFromFile()
}
if version == "" {
version = "unknown"
}
-
+
gm.versionPrefixed = version
return gm.versionPrefixed
}