Skip to content

Commit

Permalink
remove downgrade python workaround. Fixes #1587
Browse files Browse the repository at this point in the history
This is dead code after 3.8.16 release.
  • Loading branch information
schakrava committed Feb 24, 2017
1 parent f9422fa commit 2c25d0b
Showing 1 changed file with 0 additions and 20 deletions.
20 changes: 0 additions & 20 deletions src/rockstor/scripts/initrock.py
Original file line number Diff line number Diff line change
Expand Up @@ -299,20 +299,6 @@ def cleanup_rclocal(logging):
logging.info('%s looks correct. Not updating.' % rc_dest)


def downgrade_python(logging):
# With the release of CentOS 7.2, the new python package(2.7.5-34)
# backported some questionable changes that break gevent. So we downgrade
# to previous version: 2.7.5-18. I've moved these packages to rockrepo for
# now. Once the frankenversion resolves itself, we'll remove this
# workaround.
o, e, rc = run_command([YUM, 'info', 'python'])
for l in o:
if (re.match('Release.*34.el7$', l) is not None):
logging.info('Downgrading python and python-libs')
return downgrade_pkgs('python-2.7.5-18.el7_1.1',
'python-libs-2.7.5-18.el7_1.1')


def main():
loglevel = logging.INFO
if (len(sys.argv) > 1 and sys.argv[1] == '-x'):
Expand Down Expand Up @@ -435,12 +421,6 @@ def main():
run_command([SYSCTL, 'disable', 'firewalld'])
logging.info('firewalld stopped and disabled')
update_nginx(logging)
try:
# downgrading python is a stopgap until it's fixed in upstream.
downgrade_python(logging)
except Exception as e:
logging.error('Exception while downgrading python: %s' % e.__str__())
logging.exception(e)

shutil.copyfile('/etc/issue', '/etc/issue.rockstor')
for i in range(30):
Expand Down

0 comments on commit 2c25d0b

Please sign in to comment.