fix(pkg/gitreceive/storage/object.go): fix error check for missing object

Aaron Schlesinger · Aaron Schlesinger · commit 9d74c560473b · 2016-03-03T16:31:33.000-08:00
diff --git a/pkg/gitreceive/storage/object.go b/pkg/gitreceive/storage/object.go
@@ -12,12 +12,16 @@ const (
 	octetStream = "application/octet-stream"
 )
 
-func ObjectExists(statter ObjectStatter, bucket, objName string) (bool, error) {
+func ObjectExists(statter ObjectStatter, bucketName, objKey string) (bool, error) {
 	objInfo, err := statter.StatObject(bucketName, objKey)
 	if err != nil {
+		minioErr := s3.ToErrorResponse(err)
+		if minioErr.Code == noSuchKeyCode {
+			return false, nil
+		}
 		return false, err
 	}
-	if objInfo.Code == noSuchKeyCode || objInfo.Err != nil {
+	if objInfo.Err != nil {
 		return false, nil
 	}
 	return true, nil

Original file line number	Diff line number	Diff line change
`@@ -12,12 +12,16 @@ const (`
`12`	`12`	`octetStream = "application/octet-stream"`
`13`	`13`	`)`
`14`	`14`
`15`		`-func ObjectExists(statter ObjectStatter, bucket, objName string) (bool, error) {`
	`15`	`+func ObjectExists(statter ObjectStatter, bucketName, objKey string) (bool, error) {`
`16`	`16`	`objInfo, err := statter.StatObject(bucketName, objKey)`
`17`	`17`	`if err != nil {`
	`18`	`+ minioErr := s3.ToErrorResponse(err)`
	`19`	`+ if minioErr.Code == noSuchKeyCode {`
	`20`	`+ return false, nil`
	`21`	`+ }`
`18`	`22`	`return false, err`
`19`	`23`	`}`
`20`		`- if objInfo.Code == noSuchKeyCode \|\| objInfo.Err != nil {`
	`24`	`+ if objInfo.Err != nil {`
`21`	`25`	`return false, nil`
`22`	`26`	`}`
`23`	`27`	`return true, nil`