diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-07-03 16:55:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-03 16:55:24 +0200 |
| commit | f5593d305f68409cf093ea6b66a9d1f121ec0fd6 (patch) | |
| tree | 1a8acc6ffb3f4cbaca0ca5d6f1719f8144dfc10a | |
| parent | 0e8b66cc682fd39c67341d8f67c77c4cb7389511 (diff) | |
| parent | 64a91b09ae76000fe89ec165a0049b3dc3759617 (diff) | |
| download | podman-f5593d305f68409cf093ea6b66a9d1f121ec0fd6.tar.gz podman-f5593d305f68409cf093ea6b66a9d1f121ec0fd6.tar.bz2 podman-f5593d305f68409cf093ea6b66a9d1f121ec0fd6.zip | |
Merge pull request #3488 from marcov/ctr-or-pod-id
libpod: discerne partial IDs between containers and pods
| -rw-r--r-- | libpod/boltdb_state.go | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/libpod/boltdb_state.go b/libpod/boltdb_state.go index b047c9fa0..4dda3a7f0 100644 --- a/libpod/boltdb_state.go +++ b/libpod/boltdb_state.go @@ -381,11 +381,6 @@ func (s *BoltState) LookupContainer(idOrName string) (*Container, error) { defer s.closeDBCon(db) err = db.View(func(tx *bolt.Tx) error { - idBucket, err := getIDBucket(tx) - if err != nil { - return err - } - ctrBucket, err := getCtrBucket(tx) if err != nil { return err @@ -436,7 +431,7 @@ func (s *BoltState) LookupContainer(idOrName string) (*Container, error) { // We were not given a full container ID or name. // Search for partial ID matches. exists := false - err = idBucket.ForEach(func(checkID, checkName []byte) error { + err = ctrBucket.ForEach(func(checkID, checkName []byte) error { // If the container isn't in our namespace, we // can't match it if s.namespaceBytes != nil { @@ -963,11 +958,6 @@ func (s *BoltState) LookupPod(idOrName string) (*Pod, error) { defer s.closeDBCon(db) err = db.View(func(tx *bolt.Tx) error { - idBucket, err := getIDBucket(tx) - if err != nil { - return err - } - podBkt, err := getPodBucket(tx) if err != nil { return err @@ -1015,7 +1005,7 @@ func (s *BoltState) LookupPod(idOrName string) (*Pod, error) { // They did not give us a full pod name or ID. // Search for partial ID matches. exists := false - err = idBucket.ForEach(func(checkID, checkName []byte) error { + err = podBkt.ForEach(func(checkID, checkName []byte) error { // If the pod isn't in our namespace, we // can't match it if s.namespaceBytes != nil { |