Merge branch 'master' of github.com:gogits/gogs into dev
This commit is contained in:
		
						commit
						ceb415df8a
					
				
					 2 changed files with 7 additions and 1 deletions
				
			
		|  | @ -161,7 +161,7 @@ func rewriteAuthorizedKeys(key *PublicKey, p, tmpP string) error { | |||
| 	} | ||||
| 	defer fr.Close() | ||||
| 
 | ||||
| 	fw, err := os.Create(tmpP) | ||||
| 	fw, err := os.OpenFile(tmpP, os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0600) | ||||
| 	if err != nil { | ||||
| 		return err | ||||
| 	} | ||||
|  |  | |||
|  | @ -182,6 +182,12 @@ func NewConfigContext() { | |||
| 		log.Fatal("Fail to get home directory: %v", err) | ||||
| 	} | ||||
| 	RepoRootPath = Cfg.MustValue("repository", "ROOT", filepath.Join(homeDir, "gogs-repositories")) | ||||
| 	if !filepath.IsAbs(RepoRootPath) { | ||||
| 		RepoRootPath = filepath.Join(workDir, RepoRootPath) | ||||
| 	} else { | ||||
| 		RepoRootPath = filepath.Clean(RepoRootPath) | ||||
| 	} | ||||
| 
 | ||||
| 	if err = os.MkdirAll(RepoRootPath, os.ModePerm); err != nil { | ||||
| 		log.Fatal("Fail to create repository root path(%s): %v", RepoRootPath, err) | ||||
| 	} | ||||
|  |  | |||
		Loading…
	
		Reference in a new issue