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

zeripath · techknowlogick · commit 9ff9f5ad1d8d · 2019-10-10T17:08:33.000-04:00
diff --git a/models/repo.go b/models/repo.go
@@ -1946,12 +1946,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
`@@ -1946,12 +1946,11 @@ func DeleteRepository(doer *User, uid, repoID int64) error {`
`1946`	`1946`	`if err != nil {`
`1947`	`1947`	`return err`
`1948`	`1948`	`}`
`1949`		`-`
`1950`	`1949`	`if count > 1 {`
`1951`	`1950`	`continue`
`1952`	`1951`	`}`
`1953`	`1952`
`1954`		`- oidPath := filepath.Join(v.Oid[0:2], v.Oid[2:4], v.Oid[4:len(v.Oid)])`
	`1953`	`+ oidPath := filepath.Join(setting.LFS.ContentPath, v.Oid[0:2], v.Oid[2:4], v.Oid[4:len(v.Oid)])`
`1955`	`1954`	`removeAllWithNotice(sess, "Delete orphaned LFS file", oidPath)`
`1956`	`1955`	`}`
`1957`	`1956`