Fix ls -S to deal with broken/unparsable app versions more correctly
This commit is contained in:
parent
1d098eed0e
commit
3939971d82
|
@ -176,13 +176,14 @@ can take some time.
|
||||||
appStats.AutoUpdate = autoUpdate
|
appStats.AutoUpdate = autoUpdate
|
||||||
|
|
||||||
var newUpdates []string
|
var newUpdates []string
|
||||||
if version != "unknown" {
|
parsedVersion, err := tagcmp.Parse(version)
|
||||||
updates, err := recipe.GetRecipeCatalogueVersions(app.Recipe, catl)
|
if err != nil {
|
||||||
if err != nil {
|
logrus.Warning("Can't parse ", app.Recipe, " version ", version, " ", err)
|
||||||
logrus.Fatal(err)
|
}
|
||||||
}
|
|
||||||
|
if ((version != "unknown") && (err == nil)) {
|
||||||
|
updates, err := recipe.GetRecipeCatalogueVersions(app.Recipe, catl)
|
||||||
|
|
||||||
parsedVersion, err := tagcmp.Parse(version)
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
@ -190,7 +191,7 @@ can take some time.
|
||||||
for _, update := range updates {
|
for _, update := range updates {
|
||||||
parsedUpdate, err := tagcmp.Parse(update)
|
parsedUpdate, err := tagcmp.Parse(update)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Warning("can't parse ", app.Recipe," update version ", update, " ", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
if update != version && parsedUpdate.IsGreaterThan(parsedVersion) {
|
if update != version && parsedUpdate.IsGreaterThan(parsedVersion) {
|
||||||
|
|
Loading…
Reference in New Issue