Merge Pull Request #7932 from william76/Trilinos/PRDriverMergeFix-202…

…00828

Automatically Merged using Trilinos Pull Request AutoTester
PR Title: Framework: PullRequestLinuxDriverMerge.py py2-3 compatibility fix
PR Author: william76

cmake/std/PullRequestLinuxDriver.sh

@@ -120,7 +120,7 @@ then
 fi
 
 echo -e "PRDriver> "
-echo -e "PRDriver> Driver and Merge scripts unchaged, proceeding to TEST phase"
+echo -e "PRDriver> Driver and Merge scripts unchanged, proceeding to TEST phase"
 echo -e "PRDriver> "
 
 # Prepare the command for the TEST operation

cmake/std/PullRequestLinuxDriverMerge.py

@@ -91,9 +91,14 @@ def merge_branch(source_url, source_branch, target_branch, sourceSHA):
     sourceSHA     = sourceSHA.strip()
 
     remote_list = subprocess.check_output(['git', 'remote', '-v'])
+
+    if isinstance(remote_list, bytes):
+        remote_list = remote_list.decode('utf-8')
+
     if 'source_remote' in remote_list:
         print('git remote exists, removing it', file=sys.stdout)
         subprocess.check_call(['git', 'remote', 'rm', 'source_remote'])
+
     subprocess.check_call(['git', 'remote', 'add', 'source_remote', source_url])
 
     fetch_succeeded = False
@@ -104,6 +109,7 @@ def merge_branch(source_url, source_branch, target_branch, sourceSHA):
             break
         except subprocess.CalledProcessError:
             pass
+
     if not fetch_succeeded:
         raise SystemExit(12)
 
@@ -114,6 +120,9 @@ def merge_branch(source_url, source_branch, target_branch, sourceSHA):
 
     actual_source_SHA = subprocess.check_output(['git', 'rev-parse', 'source_remote/' + source_branch])
 
+    if isinstance(actual_source_SHA, bytes):
+        actual_source_SHA = actual_source_SHA.decode('utf-8')
+
     actual_source_SHA = actual_source_SHA.strip()
 
     if actual_source_SHA != sourceSHA: