Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-12-20 15:48:26 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #8708 from bitsf/tag_retention_rule_conflict

Browse Source 
fix rule conflict, id error
This commit is contained in:
Steven Zou 2019-08-20 16:45:21 +08:00 committed by GitHub
commit f6067d5474
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/api/retention.go
View File

@ -238,7 +238,7 @@ func (r *RetentionAPI) checkRuleConflict(p *policy.Metadata) error {
if old, exists := temp[string(bs)]; exists { if old, exists := temp[string(bs)]; exists {
return fmt.Errorf("rule %d is conflict with rule %d", n, old) return fmt.Errorf("rule %d is conflict with rule %d", n, old)
} }
temp[string(bs)] = tid temp[string(bs)] = n
rule.ID = tid rule.ID = tid
} }
return nil return nil