From 6ee96409d41ea2b864376b569ea10d3077dc2256 Mon Sep 17 00:00:00 2001
From: Rajdeep <ramondal@amd.com>
Date: Fri, 7 Sep 2018 15:37:42 -0400
Subject: [PATCH] Modifying the script in case user has env set to use other
 diff tool in P4DIFF.

---
 p4-diff | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/p4-diff b/p4-diff
index 472e310..ca74ddf 100755
--- a/p4-diff
+++ b/p4-diff
@@ -22,10 +22,15 @@ def userHasPerforce():
         return True
     return False
 
+def override_env():
+    my_env = os.environ.copy()
+    my_env["P4DIFF"] = 'diff'
+    return my_env
+
 def runCommand(cmd):
     if Verbose:
         print 'Executing: {}'.format(cmd)
-    p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=override_env())
     (out,err) = p.communicate()
     if len(err) > 0:
         print 'error: {}'.format(err)