1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
|
From: Reinhard Tartler <siretart@tauware.de>
Subject: Revert upstream commit updating x-exp-slices
this reverts:
commit 336c7ff1189ba42d5c29a87dd5bed55e51608e9d
Author: Miloslav Trmač <mitr@redhat.com>
Date: Tue Aug 1 21:40:26 2023 +0200
diff --git a/internal/manifest/oci_index.go b/internal/manifest/oci_index.go
index 3038d812..8832caa3 100644
--- b/internal/manifest/oci_index.go
+++ a/internal/manifest/oci_index.go
@@ -170,19 +170,8 @@
index.Manifests = append(index.Manifests, addedEntries...)
}
if len(addedEntries) != 0 || updatedAnnotations {
- slices.SortStableFunc(index.Manifests, func(a, b imgspecv1.Descriptor) int {
- // FIXME? With Go 1.21 and cmp.Compare available, turn instanceIsZstd into an integer score that can be compared, and generalizes
- // into more algorithms?
- aZstd := instanceIsZstd(a)
- bZstd := instanceIsZstd(b)
- switch {
- case aZstd == bZstd:
- return 0
- case !aZstd: // Implies bZstd
- return -1
- default: // aZstd && !bZstd
- return 1
- }
+ slices.SortStableFunc(index.Manifests, func(a, b imgspecv1.Descriptor) bool {
+ return !instanceIsZstd(a) && instanceIsZstd(b)
})
}
return nil
|
