pedro/django-orchestra-test
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fixed utils.sys.run

Browse source
This commit is contained in:
Marc Aymerich 2015-04-22 11:00:26 +00:00
parent 43d70fe83d
commit fbb3c6ab03
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
orchestra/contrib/webapps/types/wordpress.py
View file

@ -13,3 +13,6 @@ class WordPressApp(CMSApp):
"The password will be visible in the 'password' field after the installer has finished." "The password will be visible in the 'password' field after the installer has finished."
) )
icon = 'orchestra/icons/apps/WordPress.png' icon = 'orchestra/icons/apps/WordPress.png'
def get_detail(self):
return self.instance.data.get('php_version', '')

4
orchestra/utils/sys.py
View file

@ -45,7 +45,7 @@ def read_async(fd):
return '' return ''
def runiterator(command, display=False, error_codes=[0], silent=False, stdin=''): def runiterator(command, display=False, error_codes=[0], silent=False, stdin=b''):
""" Subprocess wrapper for running commands concurrently """ """ Subprocess wrapper for running commands concurrently """
if display: if display:
sys.stderr.write("\n\033[1m $ %s\033[0m\n" % command) sys.stderr.write("\n\033[1m $ %s\033[0m\n" % command)
@ -91,7 +91,7 @@ def runiterator(command, display=False, error_codes=[0], silent=False, stdin='')
raise StopIteration raise StopIteration
def run(command, display=False, error_codes=[0], silent=False, stdin='', async=False): def run(command, display=False, error_codes=[0], silent=False, stdin=b'', async=False):
iterator = runiterator(command, display, error_codes, silent, stdin) iterator = runiterator(command, display, error_codes, silent, stdin)
next(iterator) next(iterator)
if async: if async: