diff options
| author | Lamont Granquist <lamont@opscode.com> | 2021-02-05 19:37:09 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-05 19:37:09 -0800 |
| commit | b2df39628b6fae3306798dd762263b5e2478e7d3 (patch) | |
| tree | 4ea85b8202c57b8d77c0970988ef8a985b09c9b3 | |
| parent | b247aaf6b189d681604beb6a1b1c554a9b651695 (diff) | |
| parent | dccabff4042ca8d556f6f56f6ae87da6265150bf (diff) | |
| download | chef-b2df39628b6fae3306798dd762263b5e2478e7d3.tar.gz | |
Merge pull request #10991 from chef/lcg/fix-abrt-errors
DNF/YUM package: fix abrt errors
| -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: |