git commit: AMBARI-8088. Ubuntu fails to copy tarballs because of bogus output in stdout. (swagle)

[sw...@apache.org]

Repository: ambari
Updated Branches:
  refs/heads/branch-1.7.0 76d9e7059 -> 773618461


AMBARI-8088. Ubuntu fails to copy tarballs because of bogus output in stdout. (swagle)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/77361846
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/77361846
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/77361846

Branch: refs/heads/branch-1.7.0
Commit: 7736184610251656f734156b28ffbbb9bbf816b9
Parents: 76d9e70
Author: Siddharth Wagle <sw...@hortonworks.com>
Authored: Fri Oct 31 17:19:35 2014 -0700
Committer: Siddharth Wagle <sw...@hortonworks.com>
Committed: Fri Oct 31 17:22:28 2014 -0700

----------------------------------------------------------------------
 .../functions/dynamic_variable_interpretation.py       | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/77361846/ambari-common/src/main/python/resource_management/libraries/functions/dynamic_variable_interpretation.py
----------------------------------------------------------------------
diff --git a/ambari-common/src/main/python/resource_management/libraries/functions/dynamic_variable_interpretation.py b/ambari-common/src/main/python/resource_management/libraries/functions/dynamic_variable_interpretation.py
index 9049f50..fb5ffb4 100644
--- a/ambari-common/src/main/python/resource_management/libraries/functions/dynamic_variable_interpretation.py
+++ b/ambari-common/src/main/python/resource_management/libraries/functions/dynamic_variable_interpretation.py
@@ -22,7 +22,7 @@ __all__ = ["copy_tarballs_to_hdfs", ]
 import os
 import glob
 import re
-
+import tempfile
 from resource_management.libraries.functions.default import default
 from resource_management.libraries.functions.format import format
 from resource_management.libraries.resources.copy_from_local import CopyFromLocal
@@ -144,9 +144,14 @@ def copy_tarballs_to_hdfs(tarball_prefix, component_user, file_owner, group_owne
     Logger.warning("Could not find file: %s" % str(component_tar_source_file))
     return 1
 
-  get_hdp_version_cmd = "/usr/bin/hdp-select versions"
-  code, out = shell.call(get_hdp_version_cmd)
-  if code != 0 or not out.startswith(params.hdp_stack_version):
+  # Ubuntu returns: "stdin: is not a tty", as subprocess output.
+  tmpfile = tempfile.NamedTemporaryFile()
+  with open(tmpfile.name, 'r+') as file:
+    get_hdp_version_cmd = '/usr/bin/hdp-select versions > %s' % tmpfile.name
+    code, stdoutdata = shell.call(get_hdp_version_cmd)
+    out = file.read()
+  pass
+  if code != 0 or out is None or not out.startswith(params.hdp_stack_version):
     Logger.warning("Could not verify HDP version by calling '%s'. Return Code: %s, Output: %s." %
                    (get_hdp_version_cmd, str(code), str(out)))
     return 1