Fix core upgrade #291
Merged
Fix core upgrade #291
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
masci
commented
Jul 18, 2019
| res[i] = n | ||
| i++ | ||
| } | ||
| sortutil.CiAsc(res) | ||
| return res | ||
| } | ||
|
|
||
| // GetDepsOfPlatformRelease returns the deps of a specified release of a core. | ||
| func (packages Packages) GetDepsOfPlatformRelease(release *PlatformRelease) ([]*ToolRelease, error) { |
There was a problem hiding this comment.
this was just moved up in the source module
masci
commented
Jul 18, 2019
| type Packages struct { | ||
| Packages map[string]*Package // Maps packager name to Package | ||
| } | ||
| type Packages map[string]*Package // Maps packager name to Package |
There was a problem hiding this comment.
no reason for this indirection level that also makes the use of the map awkward by having to repeat packages.Packages, this way "packages is a map" and can be used directly
masci
commented
Jul 18, 2019
| @@ -44,13 +40,13 @@ type Package struct { | |||
| Email string // Email of maintainer. | |||
| Platforms map[string]*Platform // The platforms in the system. | |||
| Tools map[string]*Tool // The tools in the system. | |||
| Packages *Packages `json:"-"` | |||
There was a problem hiding this comment.
now that Packages is aliased to a map, no need to send around a pointer, map is already a reference
masci
commented
Jul 18, 2019
| @@ -132,27 +152,3 @@ func (tdep ToolDependency) extractRelease(sc Packages) (*ToolRelease, error) { | |||
| } | |||
| return release, nil | |||
| } | |||
|
|
|||
| // GetDepsOfPlatformRelease returns the deps of a specified release of a core. | |||
| func (packages *Packages) GetDepsOfPlatformRelease(release *PlatformRelease) ([]*ToolRelease, error) { | |||
There was a problem hiding this comment.
see previous comment, this was just moved
masci
commented
Jul 18, 2019
| @@ -71,7 +77,7 @@ func upgradePlatform(pm *packagemanager.PackageManager, platformRef *packagemana | |||
| } | |||
| latest := platform.GetLatestRelease() | |||
| if !latest.Version.GreaterThan(installed.Version) { | |||
| return fmt.Errorf("platform %s is already at the latest version", platformRef) | |||
| return ErrAlreadyLatest | |||
There was a problem hiding this comment.
this way we avoid returning an error if users ask to upgrade a core that's already latest
masci
commented
Jul 18, 2019
| rpcPlatform := core.PlatformReleaseToRPC(p) | ||
| rpcPlatform.Installed = p.Version.String() | ||
| installed = append(installed, rpcPlatform) | ||
| } |
There was a problem hiding this comment.
this code was moved here from the core package since here it's legit to depend on rpc
masci
commented
Jul 18, 2019
| IndexDir: indexDir, | ||
| PackagesDir: packagesDir, | ||
| DownloadDir: downloadDir, | ||
| TempDir: tempDir, | ||
| } | ||
| } | ||
|
|
||
| // Clear FIXMEDOC | ||
| func (pm *PackageManager) Clear() { |
There was a problem hiding this comment.
this wasn't used anywhere
|
Affected by the same issue as libs does not solve #285 either. Everything else LGTM |
|
@mastrolinux my bad, I copypasted the wrong issue number, this is actually for #273 I've fixed PR description |
|
I can confirm that is fixed and I am going to prepare an integration test for it. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR fixes the case where no args are passed to the upgrade command, like:
Now an upgrade will be performed to any core that is up to date. If all the cores are at the latest version, command is a no op and will exit without errors, providing and info message.
Fixes
#285#273Additional notes
I took the opportunity to review the design of the code that lists all the available cores that was depending on the
rpcpackage for no reason. Also the api of the oldPlatformListrequired acontextthat was never used.Other minor improvements are commented inline.