[PATCH] BaseTools: Hash false success.. minor change in hash invalidation

[PATCH] BaseTools: Hash false success.. minor change in hash invalidation

[Christian Rodriguez]

BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=1692

Change part of the hash error handling to invalidate hashes in the
cache destination not the cache source.

Signed-off-by: Christian Rodriguez <christian.rodriguez@intel.com>
Cc: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
---
 BaseTools/Source/Python/build/build.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/BaseTools/Source/Python/build/build.py b/BaseTools/Source/Python/build/build.py
index 71478b7268..7271570d29 100644
--- a/BaseTools/Source/Python/build/build.py
+++ b/BaseTools/Source/Python/build/build.py
@@ -1165,8 +1165,8 @@ class Build():
                     os.remove(ModuleHashFile)
 
             # Remove .hash file from cache
-            if GlobalData.gBinCacheSource:
-                FileDir = path.join(GlobalData.gBinCacheSource, moduleAutoGenObj.Arch, moduleAutoGenObj.SourceDir, moduleAutoGenObj.MetaFile.BaseName)
+            if GlobalData.gBinCacheDest:
+                FileDir = path.join(GlobalData.gBinCacheDest, moduleAutoGenObj.Arch, moduleAutoGenObj.SourceDir, moduleAutoGenObj.MetaFile.BaseName)
                 HashFile = path.join(FileDir, moduleAutoGenObj.Name + '.hash')
                 if os.path.exists(HashFile):
                     os.remove(HashFile)
-- 
2.19.1.windows.1

Re: [edk2-devel] [PATCH] BaseTools: Hash false success.. minor change in hash invalidation

[Bob Feng]

Reviewed-by: Bob Feng <bob.c.feng@intel.com>


-----Original Message-----
From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of Christian Rodriguez
Sent: Wednesday, April 17, 2019 3:41 AM
To: devel@edk2.groups.io
Cc: Feng, Bob C <bob.c.feng@intel.com>; Gao, Liming <liming.gao@intel.com>; Zhu, Yonghong <yonghong.zhu@intel.com>
Subject: [edk2-devel] [PATCH] BaseTools: Hash false success.. minor change in hash invalidation

BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=1692

Change part of the hash error handling to invalidate hashes in the cache destination not the cache source.

Signed-off-by: Christian Rodriguez <christian.rodriguez@intel.com>
Cc: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
---
 BaseTools/Source/Python/build/build.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/BaseTools/Source/Python/build/build.py b/BaseTools/Source/Python/build/build.py
index 71478b7268..7271570d29 100644
--- a/BaseTools/Source/Python/build/build.py
+++ b/BaseTools/Source/Python/build/build.py
@@ -1165,8 +1165,8 @@ class Build():
                     os.remove(ModuleHashFile)
 
             # Remove .hash file from cache
-            if GlobalData.gBinCacheSource:
-                FileDir = path.join(GlobalData.gBinCacheSource, moduleAutoGenObj.Arch, moduleAutoGenObj.SourceDir, moduleAutoGenObj.MetaFile.BaseName)
+            if GlobalData.gBinCacheDest:
+                FileDir = path.join(GlobalData.gBinCacheDest, 
+ moduleAutoGenObj.Arch, moduleAutoGenObj.SourceDir, 
+ moduleAutoGenObj.MetaFile.BaseName)
                 HashFile = path.join(FileDir, moduleAutoGenObj.Name + '.hash')
                 if os.path.exists(HashFile):
                     os.remove(HashFile)
--
2.19.1.windows.1

Re: [edk2-devel] [PATCH] BaseTools: Hash false success.. minor change in hash invalidation

[Christian Rodriguez]

Please don't forget to review this patch. It corrects a small error in my last patch. We should only invalidate hashes in the gBinCacheDest not gBinCacheSource because we want to error handle the hashes being written.

-----Original Message-----
From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of Christian Rodriguez
Sent: Tuesday, April 16, 2019 12:41 PM
To: devel@edk2.groups.io
Cc: Feng, Bob C <bob.c.feng@intel.com>; Gao, Liming <liming.gao@intel.com>; Zhu, Yonghong <yonghong.zhu@intel.com>
Subject: [edk2-devel] [PATCH] BaseTools: Hash false success.. minor change in hash invalidation

BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=1692

Change part of the hash error handling to invalidate hashes in the cache destination not the cache source.

Signed-off-by: Christian Rodriguez <christian.rodriguez@intel.com>
Cc: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
---
 BaseTools/Source/Python/build/build.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/BaseTools/Source/Python/build/build.py b/BaseTools/Source/Python/build/build.py
index 71478b7268..7271570d29 100644
--- a/BaseTools/Source/Python/build/build.py
+++ b/BaseTools/Source/Python/build/build.py
@@ -1165,8 +1165,8 @@ class Build():
                     os.remove(ModuleHashFile)
 
             # Remove .hash file from cache
-            if GlobalData.gBinCacheSource:
-                FileDir = path.join(GlobalData.gBinCacheSource, moduleAutoGenObj.Arch, moduleAutoGenObj.SourceDir, moduleAutoGenObj.MetaFile.BaseName)
+            if GlobalData.gBinCacheDest:
+                FileDir = path.join(GlobalData.gBinCacheDest, 
+ moduleAutoGenObj.Arch, moduleAutoGenObj.SourceDir, 
+ moduleAutoGenObj.MetaFile.BaseName)
                 HashFile = path.join(FileDir, moduleAutoGenObj.Name + '.hash')
                 if os.path.exists(HashFile):
                     os.remove(HashFile)
--
2.19.1.windows.1