aboutsummaryrefslogtreecommitdiff
path: root/models/models.go
diff options
context:
space:
mode:
authorFuXiaoHei <fuxiaohei@hexiaz.com>2014-04-06 14:54:39 +0800
committerFuXiaoHei <fuxiaohei@hexiaz.com>2014-04-06 14:54:39 +0800
commit98f918ed28d5a8b1c131cda587a06714a768f951 (patch)
tree04b202dfc2f639eba39304c8051bde8270b5349c /models/models.go
parent3ede496383bc0e5ad2cb9c5f034890bb6d626b3c (diff)
parentb7c3b0cc73ad8721e2eec59d018a91850ba7f750 (diff)
Merge branch 'dev' of https://github.com/gogits/gogs into dev
Diffstat (limited to 'models/models.go')
-rw-r--r--models/models.go12
1 files changed, 6 insertions, 6 deletions
diff --git a/models/models.go b/models/models.go
index 384f1fc4..0ad86337 100644
--- a/models/models.go
+++ b/models/models.go
@@ -53,10 +53,10 @@ func NewTestEngine(x *xorm.Engine) (err error) {
// os.MkdirAll(path.Dir(DbCfg.Path), os.ModePerm)
// x, err = xorm.NewEngine("sqlite3", DbCfg.Path)
default:
- return fmt.Errorf("Unknown database type: %s\n", DbCfg.Type)
+ return fmt.Errorf("Unknown database type: %s", DbCfg.Type)
}
if err != nil {
- return fmt.Errorf("models.init(fail to conntect database): %v\n", err)
+ return fmt.Errorf("models.init(fail to conntect database): %v", err)
}
return x.Sync(new(User), new(PublicKey), new(Repository), new(Watch),
@@ -75,10 +75,10 @@ func SetEngine() (err error) {
os.MkdirAll(path.Dir(DbCfg.Path), os.ModePerm)
orm, err = xorm.NewEngine("sqlite3", DbCfg.Path)
default:
- return fmt.Errorf("Unknown database type: %s\n", DbCfg.Type)
+ return fmt.Errorf("Unknown database type: %s", DbCfg.Type)
}
if err != nil {
- return fmt.Errorf("models.init(fail to conntect database): %v\n", err)
+ return fmt.Errorf("models.init(fail to conntect database): %v", err)
}
// WARNNING: for serv command, MUST remove the output to os.stdout,
@@ -89,7 +89,7 @@ func SetEngine() (err error) {
f, err := os.Create(logPath)
if err != nil {
- return fmt.Errorf("models.init(fail to create xorm.log): %v\n", err)
+ return fmt.Errorf("models.init(fail to create xorm.log): %v", err)
}
orm.Logger = f
@@ -104,7 +104,7 @@ func NewEngine() (err error) {
return err
} else if err = orm.Sync(new(User), new(PublicKey), new(Repository), new(Watch),
new(Action), new(Access), new(Issue), new(Comment)); err != nil {
- return fmt.Errorf("sync database struct error: %v\n", err)
+ return fmt.Errorf("sync database struct error: %v", err)
}
return nil
}