toolshed/abra
4
3
Fork 18
Code Issues 30 Pull Requests 3 Packages Releases 41 Activity

Fix ls -S to deal with broken/unparsable app versions more correctly #385

Closed
cas wants to merge 2 commits from cr_fix_ls-S into cr_dockerinside
pull from: cr_fix_ls-S
merge into: toolshed:cr_dockerinside
Conversation 3 Commits 2 Files Changed 1 +15 -12
1 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
cli/app/list.go
View File

@ -176,13 +176,14 @@ can take some time.
appStats.AutoUpdate = autoUpdate
var newUpdates []string
if version != "unknown" {
updates, err := recipe.GetRecipeCatalogueVersions(app.Recipe, catl)
if err != nil {
logrus.Fatal(err)
}
if (version != "unknown") {
decentral1se commented 2023-11-27 10:26:32 +00:00
Review
Copy Link

(...) not required?

`(...)` not required?
parsedVersion, err := tagcmp.Parse(version)
if (err != nil) {
logrus.Warning("Can't parse ", app.Recipe, " version ", version, " ", err)
} else {
updates, err := recipe.GetRecipeCatalogueVersions(app.Recipe, catl)
if err != nil {
logrus.Fatal(err)
}
@ -190,7 +191,8 @@ can take some time.
for _, update := range updates {
parsedUpdate, err := tagcmp.Parse(update)
if err != nil {
logrus.Fatal(err)
logrus.Warning("can't parse ", app.Recipe," update version ", update, " ", err)
continue
}
if update != version && parsedUpdate.IsGreaterThan(parsedVersion) {
@ -198,6 +200,7 @@ can take some time.
}
}
}
}
if len(newUpdates) == 0 {
if version == "unknown" {