diff options
| author | Ben Howard <ben.howard@ubuntu.com> | 2016-02-08 16:33:07 -0700 |
|---|---|---|
| committer | usd-importer <ubuntu-server@lists.ubuntu.com> | 2016-02-09 00:59:05 +0000 |
| commit | 5eee50d19640c3c1ee5c2584d6f69e0ce5423214 (patch) | |
| tree | b0c8b3050a2db0059ce9f17a290297de89ff6986 /azurelinuxagent/utils/shellutil.py | |
| parent | db0601bdd8753aad210589ec9ce22ee67984df27 (diff) | |
| parent | 9bb648958a406f80ab2097969e2e1ac65fec11a0 (diff) | |
| download | vyos-walinuxagent-5eee50d19640c3c1ee5c2584d6f69e0ce5423214.tar.gz vyos-walinuxagent-5eee50d19640c3c1ee5c2584d6f69e0ce5423214.zip | |
Import patches-applied version 2.1.3-0ubuntu1 to applied/ubuntu/xenial-proposed
Imported using git-ubuntu import.
Changelog parent: db0601bdd8753aad210589ec9ce22ee67984df27
Unapplied parent: 9bb648958a406f80ab2097969e2e1ac65fec11a0
New changelog entries:
* New upstream release (LP: #1543359):
- Bug fixes for extension handling
- Feature enablement for AzureStack.
Diffstat (limited to 'azurelinuxagent/utils/shellutil.py')
| -rw-r--r-- | azurelinuxagent/utils/shellutil.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/azurelinuxagent/utils/shellutil.py b/azurelinuxagent/utils/shellutil.py index 372c78a..98871a1 100644 --- a/azurelinuxagent/utils/shellutil.py +++ b/azurelinuxagent/utils/shellutil.py @@ -20,7 +20,7 @@ import platform import os import subprocess -from azurelinuxagent.future import text +from azurelinuxagent.future import ustr import azurelinuxagent.logger as logger if not hasattr(subprocess,'check_output'): @@ -75,9 +75,9 @@ def run_get_output(cmd, chk_err=True, log_cmd=True): logger.verb(u"run cmd '{0}'", cmd) try: output=subprocess.check_output(cmd,stderr=subprocess.STDOUT,shell=True) - output = text(output, encoding='utf-8', errors="backslashreplace") + output = ustr(output, encoding='utf-8', errors="backslashreplace") except subprocess.CalledProcessError as e : - output = text(e.output, encoding='utf-8', errors="backslashreplace") + output = ustr(e.output, encoding='utf-8', errors="backslashreplace") if chk_err: if log_cmd: logger.error(u"run cmd '{0}' failed", e.cmd) |