Ensure that LFS files are relative to the LFS content path (#8455) (#8458)

zeripath · web-flow · commit d330b2f52b59 · 2019-10-11T13:41:55.000+01:00
diff --git a/models/repo.go b/models/repo.go
@@ -1895,12 +1895,11 @@ func DeleteRepository(doer *User, uid, repoID int64) error {
 		if err != nil {
 			return err
 		}
-
 		if count > 1 {
 			continue
 		}
 
-		oidPath := filepath.Join(v.Oid[0:2], v.Oid[2:4], v.Oid[4:len(v.Oid)])
+		oidPath := filepath.Join(setting.LFS.ContentPath, v.Oid[0:2], v.Oid[2:4], v.Oid[4:len(v.Oid)])
 		removeAllWithNotice(sess, "Delete orphaned LFS file", oidPath)
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -1895,12 +1895,11 @@ func DeleteRepository(doer *User, uid, repoID int64) error {`
`1895`	`1895`	`if err != nil {`
`1896`	`1896`	`return err`
`1897`	`1897`	`}`
`1898`		`-`
`1899`	`1898`	`if count > 1 {`
`1900`	`1899`	`continue`
`1901`	`1900`	`}`
`1902`	`1901`
`1903`		`- oidPath := filepath.Join(v.Oid[0:2], v.Oid[2:4], v.Oid[4:len(v.Oid)])`
	`1902`	`+ oidPath := filepath.Join(setting.LFS.ContentPath, v.Oid[0:2], v.Oid[2:4], v.Oid[4:len(v.Oid)])`
`1904`	`1903`	`removeAllWithNotice(sess, "Delete orphaned LFS file", oidPath)`
`1905`	`1904`	`}`
`1906`	`1905`