diff options
| author | tyler-ball <tyleraball@gmail.com> | 2014-12-05 18:06:55 -0800 |
|---|---|---|
| committer | tyler-ball <tyleraball@gmail.com> | 2014-12-05 18:06:55 -0800 |
| commit | 091001ae8d27a8a5de03af2c20905e23a8ffefb7 (patch) | |
| tree | 28abfa5821f80e2090b8f89988a0bab004b710a5 /lib/chef/provider/package/yum-dump.py | |
| parent | 8a7b450cb87ef62e9f21d32c91a52accefba6ffd (diff) | |
| parent | a45716b67a2168c21b166e4aab38668e9b96d856 (diff) | |
| download | chef-merging-master.tar.gz | |
Merge branch 'master' into merging-mastermerging-master
Conflicts:
lib/chef/version.rb
Diffstat (limited to 'lib/chef/provider/package/yum-dump.py')
| -rw-r--r-- | lib/chef/provider/package/yum-dump.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/chef/provider/package/yum-dump.py b/lib/chef/provider/package/yum-dump.py index 8b09dedbf0..c9f6a1fcea 100644 --- a/lib/chef/provider/package/yum-dump.py +++ b/lib/chef/provider/package/yum-dump.py @@ -23,7 +23,7 @@ # and dump the results to stdout. # # yum-dump invokes yum similarly to the command line interface which makes it -# subject to most of the configuration paramaters in yum.conf. yum-dump will +# subject to most of the configuration parameters in yum.conf. yum-dump will # also load yum plugins in the same manor as yum - these can affect the output. # # Can be run as non root, but that won't update the cache. @@ -70,7 +70,7 @@ def setup(yb, options): else: yb.doConfigSetup(errorlevel=0, debuglevel=0) except yum.Errors.ConfigError, e: - # supresses an ignored exception at exit + # suppresses an ignored exception at exit yb.preconf = None print >> sys.stderr, "yum-dump Config Error: %s" % e return 1 |