Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix the issue that merge not work with official offline package #1121

Merged
merged 2 commits into from
Feb 2, 2021
Merged

Fix the issue that merge not work with official offline package #1121

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
18ff080
Fix the issue that merge not work with official offline package
lucklove Feb 2, 2021
07d3d8c
Merge branch 'master' into fix-merge
ti-chi-bot Feb 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkg/repository/merge_mirror.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ func component2Diff(name string, baseItem v1manifest.ComponentItem, baseManifest
}

// this version not exits in base
if baseManifest.VersionListWithYanked(plat)[ver].URL == "" {
if baseManifest.VersionList(plat)[ver].URL == "" {
osArch := strings.Split(plat, "/")
if len(osArch) != 2 {
continue
Expand Down