mirror of
				https://github.com/go-gitea/gitea
				synced 2025-11-04 13:28:25 +00:00 
			
		
		
		
	Merge branch 'master' of github.com:gogits/gogs into dev
This commit is contained in:
		@@ -161,7 +161,7 @@ func rewriteAuthorizedKeys(key *PublicKey, p, tmpP string) error {
 | 
				
			|||||||
	}
 | 
						}
 | 
				
			||||||
	defer fr.Close()
 | 
						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 {
 | 
						if err != nil {
 | 
				
			||||||
		return err
 | 
							return err
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -182,6 +182,12 @@ func NewConfigContext() {
 | 
				
			|||||||
		log.Fatal("Fail to get home directory: %v", err)
 | 
							log.Fatal("Fail to get home directory: %v", err)
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
	RepoRootPath = Cfg.MustValue("repository", "ROOT", filepath.Join(homeDir, "gogs-repositories"))
 | 
						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 {
 | 
						if err = os.MkdirAll(RepoRootPath, os.ModePerm); err != nil {
 | 
				
			||||||
		log.Fatal("Fail to create repository root path(%s): %v", RepoRootPath, err)
 | 
							log.Fatal("Fail to create repository root path(%s): %v", RepoRootPath, err)
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user