opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-12-05 04:40:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

vendor: update c/{common, image, storage} to latest main

Browse Source 
Just to make sure everything still works ahead of monorepo move.

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
This commit is contained in:
Paul Holzinger
2025-08-21 18:27:24 +02:00
parent 0615fdecfc
commit e76b08394e
370 changed files with 1274 additions and 28518 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
vendor/github.com/containers/common/libimage/manifest_list.go generated vendored
View File

@@ -319,27 +319,16 @@ func (m *ManifestList) saveAndReload() error {
if err != nil {
return err
}
// Make sure to reload the image from the containers storage to fetch
// the latest data (e.g., new or delete digests).
if err := m.image.reload(); err != nil {
return err
}
image, list, err := m.image.runtime.lookupManifestList(newID)
if err != nil {
return err
}
m.image = image
m.list = list
return nil
return m.reloadID(newID)
}
// Reload the image and list instances from storage
func (m *ManifestList) reload() error {
listID := m.ID()
if err := m.image.reload(); err != nil {
return err
}
return m.reloadID(listID)
}
func (m *ManifestList) reloadID(listID string) error {
image, list, err := m.image.runtime.lookupManifestList(listID)
if err != nil {
return err
@@ -669,6 +658,18 @@ func (m *ManifestList) AnnotateInstance(d digest.Digest, options *ManifestListAn
return nil
}
locker, err := manifests.LockerForImage(m.image.runtime.store, m.ID())
if err != nil {
return err
}
locker.Lock()
defer locker.Unlock()
// Make sure to reload the image from the containers storage to fetch
// the latest data (e.g., new or delete digests).
if err := m.reload(); err != nil {
return err
}
if len(options.OS) > 0 {
if err := m.list.SetOS(d, options.OS); err != nil {
return err
@@ -752,6 +753,18 @@ func (m *ManifestList) AnnotateInstance(d digest.Digest, options *ManifestListAn
// RemoveInstance removes the instance specified by `d` from the manifest list.
// Returns the new ID of the image.
func (m *ManifestList) RemoveInstance(d digest.Digest) error {
locker, err := manifests.LockerForImage(m.image.runtime.store, m.ID())
if err != nil {
return err
}
locker.Lock()
defer locker.Unlock()
// Make sure to reload the image from the containers storage to fetch
// the latest data (e.g., new or delete digests).
if err := m.reload(); err != nil {
return err
}
if err := m.list.Remove(d); err != nil {
return err
}