diff options
author | John McCrae <john.mccrae@progress.com> | 2022-12-21 11:08:35 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-12-21 11:08:35 -0800 |
commit | c566180ca560fe46315cb9b2c8945b698c270f5c (patch) | |
tree | 3c9b64eb957c4d671c302a942fa89549d12c783a | |
parent | 41bd002ec75e8383b516a699e38b51b502815edb (diff) | |
parent | 42fe730721f9052a97009f2889c3707d812117e8 (diff) | |
download | chef-c566180ca560fe46315cb9b2c8945b698c270f5c.tar.gz |
Merge pull request #13454 from chef/jfm/INFC-381
Added or Corrected spelling and corrected a Python exception handler …
-rw-r--r-- | cspell.json | 6 | ||||
-rw-r--r-- | lib/chef/provider/package/yum/yum_helper.py | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/cspell.json b/cspell.json index 6b23689927..497e5e09ba 100644 --- a/cspell.json +++ b/cspell.json @@ -355,6 +355,7 @@ "executionpolicy", "execvp", "exitcode", + "expandtab", "EXTGLOB", "extname", "extrastuff", @@ -728,6 +729,7 @@ "minmax", "mirrorlist", "mirrorlists", + "miscutils", "MITM", "mkgroup", "mkmf", @@ -842,6 +844,7 @@ "nokeys", "NOLICPROMPT", "NOLOGON", + "NONBLOCK", "NONINTERACTIVE", "noninteractive", "NONPAGED", @@ -1201,6 +1204,7 @@ "Shellwords", "shellwords", "SHIFTJIS", + "shiftwidth", "shortname", "Shouldnotexist", "SHOWDEFAULT", @@ -1216,6 +1220,7 @@ "sideload", "sierles", "signedheaderauth", + "SIGPIPE", "SIGQUIT", "SIGUSR", "silentlycontinue", @@ -1232,6 +1237,7 @@ "SMARTCARDROOT", "Smokish", "SMTO", + "softtabstop", "solv", "somedir", "somefile", diff --git a/lib/chef/provider/package/yum/yum_helper.py b/lib/chef/provider/package/yum/yum_helper.py index e3718f994d..71b41760ee 100644 --- a/lib/chef/provider/package/yum/yum_helper.py +++ b/lib/chef/provider/package/yum/yum_helper.py @@ -92,8 +92,8 @@ def query(base, command): # then the result was searchNevra'd. please be extremely careful if attempting to fix that # since searchNevra does not support prco tuples. if bool(re.search('\\s+', command['provides'])): - # handles flags (<, >, =, etc) and versions, but no wildcareds - # raises error for any invalid input like: 'FOO BAR BAZ' + # handles flags (<, >, =, etc) and versions, but no wildcards + # raises error for any invalid input like: 'FOO BAR BAZ' pkgs = obj.getProvides(*string_to_prco_tuple(command['provides'])) elif do_nevra: # now if we're given version or arch properties explicitly, then we do a SearchNevra. @@ -166,7 +166,7 @@ try: try: command = json.loads(line) - except ValueError, e: + except ValueError as e: raise RuntimeError("bad json parse") if base is None: |