diff options
author | Rodolfo Carvalho <rhcarvalho@gmail.com> | 2017-02-06 14:26:43 +0100 |
---|---|---|
committer | Rodolfo Carvalho <rhcarvalho@gmail.com> | 2017-02-10 14:28:18 +0100 |
commit | d2654790c5519e2ab722602d4c6b04197a4daca5 (patch) | |
tree | 1f08c951ab95a83b0dba7362b22b1ef1733d301f /roles/openshift_preflight | |
parent | 9e92660ed86623385e48c4960f4db681d86a7a57 (diff) | |
download | openshift-d2654790c5519e2ab722602d4c6b04197a4daca5.tar.gz openshift-d2654790c5519e2ab722602d4c6b04197a4daca5.tar.bz2 openshift-d2654790c5519e2ab722602d4c6b04197a4daca5.tar.xz openshift-d2654790c5519e2ab722602d4c6b04197a4daca5.zip |
Remove commented-out debugging code
Diffstat (limited to 'roles/openshift_preflight')
-rwxr-xr-x | roles/openshift_preflight/base/library/aos_version.py | 15 | ||||
-rwxr-xr-x | roles/openshift_preflight/base/library/check_yum_update.py | 13 |
2 files changed, 0 insertions, 28 deletions
diff --git a/roles/openshift_preflight/base/library/aos_version.py b/roles/openshift_preflight/base/library/aos_version.py index f7fcb6da5..fe06d010c 100755 --- a/roles/openshift_preflight/base/library/aos_version.py +++ b/roles/openshift_preflight/base/library/aos_version.py @@ -10,8 +10,6 @@ Also, determine if the version requested is available down to the precision requested. ''' -# import os -# import sys import yum # pylint: disable=import-error from ansible.module_utils.basic import AnsibleModule @@ -24,19 +22,7 @@ def main(): # pylint: disable=missing-docstring supports_check_mode=True ) - # NOTE(rhcarvalho): sosiouxme added _unmute, but I couldn't find a case yet - # for when it is actually necessary. Leaving it commented out for now, - # though this comment and the commented out code related to _unmute should - # be deleted later if not proven necessary. - - # sys.stdout = os.devnull # mute yum so it doesn't break our output - # sys.stderr = os.devnull # mute yum so it doesn't break our output - - # def _unmute(): # pylint: disable=missing-docstring - # sys.stdout = sys.__stdout__ - def bail(error): # pylint: disable=missing-docstring - # _unmute() module.fail_json(msg=error) yb = yum.YumBase() # pylint: disable=invalid-name @@ -92,7 +78,6 @@ def main(): # pylint: disable=missing-docstring msg += ' %s\n' % name bail(msg + "There should only be one OpenShift version's repository enabled at a time.") - # _unmute() module.exit_json(changed=False) diff --git a/roles/openshift_preflight/base/library/check_yum_update.py b/roles/openshift_preflight/base/library/check_yum_update.py index 296ebd44f..c72bce937 100755 --- a/roles/openshift_preflight/base/library/check_yum_update.py +++ b/roles/openshift_preflight/base/library/check_yum_update.py @@ -8,7 +8,6 @@ parameters: If omitted, all installed RPMs are considered for updates. ''' -# import os import sys import yum # pylint: disable=import-error from ansible.module_utils.basic import AnsibleModule @@ -22,18 +21,7 @@ def main(): # pylint: disable=missing-docstring,too-many-branches supports_check_mode=True ) - # NOTE(rhcarvalho): sosiouxme added _unmute, but I couldn't find a case yet - # for when it is actually necessary. Leaving it commented out for now, - # though this comment and the commented out code related to _unmute should - # be deleted later if not proven necessary. - - # sys.stdout = os.devnull # mute yum so it doesn't break our output - - # def _unmute(): # pylint: disable=missing-docstring - # sys.stdout = sys.__stdout__ - def bail(error): # pylint: disable=missing-docstring - # _unmute() module.fail_json(msg=error) yb = yum.YumBase() # pylint: disable=invalid-name @@ -108,7 +96,6 @@ def main(): # pylint: disable=missing-docstring,too-many-branches bail('Unknown error(s) from dependency resolution. Exit Code: %d:\n%s' % (txn_result, txn_msgs)) - # _unmute() module.exit_json(changed=False) |