Patchwork [bitbake-devel,2/2] data_smart: Improve the calculation of config hash

login
register
mail settings
Submitter Dongxiao Xu
Date April 16, 2012, 1:17 p.m.
Message ID <3880b5f056e6a522fee8a7589fb20d4c0da36c91.1334582048.git.dongxiao.xu@intel.com>
Download mbox | patch
Permalink /patch/25931/
State Accepted
Commit 0f1b142a3f6b8125bf023c2e5ec269618869abf7
Headers show

Comments

Dongxiao Xu - April 16, 2012, 1:17 p.m.
For config hash, we put the keys in structure of "set()", which is not
order sensitive. Therefore when calculating the md5 value for config
hash, we need to identify the order of the keys.

Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
---
 lib/bb/data_smart.py |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

Patch

diff --git a/lib/bb/data_smart.py b/lib/bb/data_smart.py
index 2c200db..27fb7d9 100644
--- a/lib/bb/data_smart.py
+++ b/lib/bb/data_smart.py
@@ -462,13 +462,14 @@  class DataSmart(MutableMapping):
         self.delVar(var)
 
     def get_hash(self):
-        data = ""
+        data = {}
         config_whitelist = set((self.getVar("BB_HASHCONFIG_WHITELIST", True) or "").split())
         keys = set(key for key in iter(self) if not key.startswith("__"))
         for key in keys:
             if key in config_whitelist:
                 continue
             value = self.getVar(key, False) or ""
-            data = data + key + ': ' + str(value) + '\n'
+            data.update({key:value})
 
-        return hashlib.md5(data).hexdigest()
+        data_str = str([(k, data[k]) for k in sorted(data.keys())])
+        return hashlib.md5(data_str).hexdigest()