diff options
| author | Tim Smith <tsmith@chef.io> | 2021-03-04 15:55:49 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-04 15:55:49 -0800 |
| commit | 766c109fe829d4e1b47cfe8f098de894715bb199 (patch) | |
| tree | cc75db4648c0c485c4244b8abd16963f3bd50ea4 | |
| parent | 52e5accd057374f76dcca5d0cc8e51a98d1a3162 (diff) | |
| parent | 572642291db33e455ebe451a0e2743e9fadb6e91 (diff) | |
| download | chef-766c109fe829d4e1b47cfe8f098de894715bb199.tar.gz | |
Merge pull request #11139 from MsysTechnologiesllc/dh/backport-pr-10991
Signed-off-by: Tim Smith <tsmith@chef.io>
| -rw-r--r-- | lib/chef/provider/package/dnf/dnf_helper.py | 4 | ||||
| -rw-r--r-- | lib/chef/provider/package/yum/yum_helper.py | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/lib/chef/provider/package/dnf/dnf_helper.py b/lib/chef/provider/package/dnf/dnf_helper.py index 325ce14041..302bcd9562 100644 --- a/lib/chef/provider/package/dnf/dnf_helper.py +++ b/lib/chef/provider/package/dnf/dnf_helper.py @@ -168,6 +168,10 @@ try: setup_exit_handler() line = inpipe.readline() + # only way to detect EOF in python + if line == "": + break + try: command = json.loads(line) except ValueError: diff --git a/lib/chef/provider/package/yum/yum_helper.py b/lib/chef/provider/package/yum/yum_helper.py index 47cbe2efe6..465dceab18 100644 --- a/lib/chef/provider/package/yum/yum_helper.py +++ b/lib/chef/provider/package/yum/yum_helper.py @@ -196,6 +196,10 @@ try: setup_exit_handler() line = inpipe.readline() + # only way to detect EOF in python + if line == "": + break + try: command = json.loads(line) except ValueError, e: |