From fbb3c6ab031371e1585d57f9e54ee741c3054dd3 Mon Sep 17 00:00:00 2001 From: Marc Aymerich Date: Wed, 22 Apr 2015 11:00:26 +0000 Subject: [PATCH] Fixed utils.sys.run --- orchestra/contrib/webapps/types/wordpress.py | 3 +++ orchestra/utils/sys.py | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/orchestra/contrib/webapps/types/wordpress.py b/orchestra/contrib/webapps/types/wordpress.py index 0b55f546..b8606246 100644 --- a/orchestra/contrib/webapps/types/wordpress.py +++ b/orchestra/contrib/webapps/types/wordpress.py @@ -13,3 +13,6 @@ class WordPressApp(CMSApp): "The password will be visible in the 'password' field after the installer has finished." ) icon = 'orchestra/icons/apps/WordPress.png' + + def get_detail(self): + return self.instance.data.get('php_version', '') diff --git a/orchestra/utils/sys.py b/orchestra/utils/sys.py index 4277cc46..f452f970 100644 --- a/orchestra/utils/sys.py +++ b/orchestra/utils/sys.py @@ -45,7 +45,7 @@ def read_async(fd): 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 """ if display: 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 -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) next(iterator) if async: