Compare commits

..

No commits in common. "7659d7a0aac08958133bbc60f61557bd4b0bc19d" and "99ccf596a0ece49a1a044d152584cb0f5960cbad" have entirely different histories.

2 changed files with 1 additions and 17 deletions

7
debian/changelog vendored
View File

@ -1,10 +1,3 @@
snapd-extra-utils (1.0.2) UNRELEASED; urgency=medium
* Fix edge cases where the snap revision may be older in the target channel
than it is locally.
-- Simon Quigley <tsimonq2@ubuntu.com> Wed, 06 Nov 2024 18:48:19 -0600
snapd-extra-utils (1.0.1) plucky; urgency=medium snapd-extra-utils (1.0.1) plucky; urgency=medium
* Add missing cmake build dependency. * Add missing cmake build dependency.

View File

@ -15,7 +15,6 @@ package main
import ( import (
"fmt" "fmt"
"os" "os"
"math"
"path/filepath" "path/filepath"
"strconv" "strconv"
"strings" "strings"
@ -104,18 +103,10 @@ func collectSnapDependencies(snapName, channel, fallbackChannel, snapsDir, asser
} }
info := result.Info info := result.Info
// If the snap we fetched has a lower revision than the snap installed, use that
newRevision := 0
if info.Revision.N != 0 && oldSnap != nil && oldSnap.Revision.N != 0 {
newRevision = int(math.Max(float64(info.Revision.N), float64(oldSnap.Revision.N)))
} else {
newRevision = info.Revision.N
}
newSnap := &store.CurrentSnap{ newSnap := &store.CurrentSnap{
InstanceName: snapName, InstanceName: snapName,
SnapID: info.SnapID, SnapID: info.SnapID,
Revision: snap.Revision{N: newRevision}, Revision: snap.Revision{N: info.Revision.N},
TrackingChannel: workingChannel, TrackingChannel: workingChannel,
} }
snapInCurrentSnaps, oldRevision := isSnapInCurrentSnaps(snapName) snapInCurrentSnaps, oldRevision := isSnapInCurrentSnaps(snapName)