diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-04-19 10:51:58 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-19 10:51:58 -0400 |
| commit | b5e0b292bf4ebf98a1ad45681da5f297d86de44b (patch) | |
| tree | fcc61f3b04d87655708587e1ad93969c316ebf50 /libpod | |
| parent | a917bae67d51c8759e65b712437af9e5fbfffd66 (diff) | |
| parent | db21c1c0ea73d72b7160d1ba75a144a5b5e44a8e (diff) | |
| download | podman-b5e0b292bf4ebf98a1ad45681da5f297d86de44b.tar.gz podman-b5e0b292bf4ebf98a1ad45681da5f297d86de44b.tar.bz2 podman-b5e0b292bf4ebf98a1ad45681da5f297d86de44b.zip | |
Merge pull request #10056 from mheon/misc_cleanup
[NO TESTS NEEDED] Make an advanced layer diff function private
Diffstat (limited to 'libpod')
| -rw-r--r-- | libpod/diff.go | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/libpod/diff.go b/libpod/diff.go index 36d60b838..df1acf4bb 100644 --- a/libpod/diff.go +++ b/libpod/diff.go @@ -1,8 +1,6 @@ package libpod import ( - "io" - "github.com/containers/podman/v3/libpod/layers" "github.com/containers/storage/pkg/archive" "github.com/pkg/errors" @@ -46,16 +44,6 @@ func (r *Runtime) GetDiff(from, to string) ([]archive.Change, error) { return rchanges, err } -// ApplyDiffTarStream applies the changes stored in 'diff' to the layer 'to' -func (r *Runtime) ApplyDiffTarStream(to string, diff io.Reader) error { - toLayer, err := r.getLayerID(to) - if err != nil { - return err - } - _, err = r.store.ApplyDiff(toLayer, diff) - return err -} - // GetLayerID gets a full layer id given a full or partial id // If the id matches a container or image, the id of the top layer is returned // If the id matches a layer, the top layer id is returned |