From 0f1b142a3f6b8125bf023c2e5ec269618869abf7 Mon Sep 17 00:00:00 2001 From: Dongxiao Xu Date: Tue, 17 Apr 2012 16:21:37 +0800 Subject: data_smart: Improve the calculation of config hash 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 Signed-off-by: Richard Purdie --- lib/bb/data_smart.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'lib/bb/data_smart.py') diff --git a/lib/bb/data_smart.py b/lib/bb/data_smart.py index 2c200db32..27fb7d991 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() -- cgit 1.2.3-korg