diff options
| author | Gabriel Jackson <gabriel@coffeepowered.co> | 2017-01-29 12:13:57 -0800 |
|---|---|---|
| committer | Kim "BKC" Carlbäcker <kim.carlbacker@gmail.com> | 2017-02-02 15:24:18 +0100 |
| commit | bf6f61cc690978bcad416ace8e8da2418602cbf3 (patch) | |
| tree | 98be4a5abcd53063b41676772b8dd37a47621c44 /models/pull.go | |
| parent | 73d05a51e3dce4a5b31b8660a6141a14ae615404 (diff) | |
| download | gitea-bf6f61cc690978bcad416ace8e8da2418602cbf3.tar.gz gitea-bf6f61cc690978bcad416ace8e8da2418602cbf3.zip | |
Cleanup log messaging
This change corrects a few logging issues:
* Standardized formatting errors with '%v'.
* Standardized failure warning word usage.
* Corrected an instance of using the standard log library when
the gitea log library should be used instead.
Diffstat (limited to 'models/pull.go')
| -rw-r--r-- | models/pull.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/models/pull.go b/models/pull.go index e680480978..bdbe4b3a98 100644 --- a/models/pull.go +++ b/models/pull.go @@ -275,7 +275,7 @@ func (pr *PullRequest) Merge(doer *User, baseGitRepo *git.Repository) (err error tmpBasePath := path.Join(setting.AppDataPath, "tmp/repos", com.ToStr(time.Now().Nanosecond())+".git") if err := os.MkdirAll(path.Dir(tmpBasePath), os.ModePerm); err != nil { - return fmt.Errorf("Fail to create dir %s: %v", tmpBasePath, err) + return fmt.Errorf("Failed to create dir %s: %v", tmpBasePath, err) } defer os.RemoveAll(path.Dir(tmpBasePath)) |