diff options
| author | Ed Santiago <santiago@redhat.com> | 2018-11-27 16:06:14 -0700 |
|---|---|---|
| committer | Ed Santiago <santiago@redhat.com> | 2018-11-27 16:13:36 -0700 |
| commit | 8b2affbd5bc56e822059b07730b52870760d39be (patch) | |
| tree | dacf98c67923e0f231dbff7a8db6ea9eadaf6225 | |
| parent | 6df7409cb5a41c710164c42ed35e33b28f3f7214 (diff) | |
| download | podman-8b2affbd5bc56e822059b07730b52870760d39be.tar.gz podman-8b2affbd5bc56e822059b07730b52870760d39be.tar.bz2 podman-8b2affbd5bc56e822059b07730b52870760d39be.zip | |
_split_token(): handle None
The conditional + list comprehension in images.py:_split_token()
wasn't quite working as intended; in particular, when fed None,
it chokes with
TypeError: 'NoneType' object is not iterable
This is the correct behavior: comprehensions iterate first,
then apply the conditional.
Solution: special-case None, and remove the now-unnecessary
conditional.
Context: seen when trying 'pypodman run' against
docker.io/stackbrew/centos:7, which has no .ContainerConfig.Eng
Signed-off-by: Ed Santiago <santiago@redhat.com>
| -rw-r--r-- | contrib/python/podman/podman/libs/images.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/contrib/python/podman/podman/libs/images.py b/contrib/python/podman/podman/libs/images.py index 9453fb416..6dfc4a656 100644 --- a/contrib/python/podman/podman/libs/images.py +++ b/contrib/python/podman/podman/libs/images.py @@ -27,9 +27,10 @@ class Image(collections.UserDict): @staticmethod def _split_token(values=None, sep='='): + if not values: + return {} return { - k: v1 - for k, v1 in (v0.split(sep, 1) for v0 in values if values) + k: v1 for k, v1 in (v0.split(sep, 1) for v0 in values) } def create(self, *args, **kwargs): |