Commit b54fd6db authored by Paul McCarthy's avatar Paul McCarthy 🚵
Browse files

Merge branch 'bf/flush' into 'master'

Bf/flush

See merge request fsl/conda/installer!27
parents a489e724 39ad8a56
...@@ -31,11 +31,8 @@ import tempfile ...@@ -31,11 +31,8 @@ import tempfile
import threading import threading
import traceback import traceback
# TODO check py2/3 try: import urllib.request as urlrequest
try: except ImportError: import urllib as urlrequest
import urllib.request as urlrequest
except ImportError:
import urllib as urlrequest
try: import queue try: import queue
except ImportError: import Queue as queue except ImportError: import Queue as queue
...@@ -51,7 +48,7 @@ log = logging.getLogger(__name__) ...@@ -51,7 +48,7 @@ log = logging.getLogger(__name__)
__absfile__ = op.abspath(__file__).rstrip('c') __absfile__ = op.abspath(__file__).rstrip('c')
__version__ = '1.4.2' __version__ = '1.4.3'
"""Installer script version number. This must be updated """Installer script version number. This must be updated
whenever a new version of the installer script is released. whenever a new version of the installer script is released.
""" """
...@@ -1050,6 +1047,7 @@ class Process(object): ...@@ -1050,6 +1047,7 @@ class Process(object):
cmd = ['sudo', '-S', '-k'] + cmd cmd = ['sudo', '-S', '-k'] + cmd
proc = sp.Popen(cmd, **kwargs) proc = sp.Popen(cmd, **kwargs)
proc.stdin.write('{}\n'.format(password).encode()) proc.stdin.write('{}\n'.format(password).encode())
proc.stdin.flush()
return proc return proc
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment