summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2013-12-20 12:07:20 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-12-20 12:26:06 +0000
commit0b5476a3fab7e951292c18637831a30f22c5d21d (patch)
tree48917c33a0555531690df6b46ae442d18d1b005b
parenteebe65c18603638d221d4b7718675476de5d280c (diff)
downloadpoky-0b5476a3fab7e951292c18637831a30f22c5d21d.tar.gz
bitbake: siggen: Fix reversed difference output
The output when comparing siginfo files for dict_diff is reversed and shows additions when things were removed and vice versa. This patch reverses the operation so the changes are shown correctly and makes the output less confusing. (Bitbake rev: 9b4142df36619099670740a5d3bc94e404ab2b56) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/bb/siggen.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/bitbake/lib/bb/siggen.py b/bitbake/lib/bb/siggen.py
index 370f6ad3b3..bc96fd3b7a 100644
--- a/bitbake/lib/bb/siggen.py
+++ b/bitbake/lib/bb/siggen.py
@@ -318,8 +318,8 @@ def compare_sigfiles(a, b, recursecb = None):
318 for i in common: 318 for i in common:
319 if a[i] != b[i] and i not in whitelist: 319 if a[i] != b[i] and i not in whitelist:
320 changed.add(i) 320 changed.add(i)
321 added = sa - sb 321 added = sb - sa
322 removed = sb - sa 322 removed = sa - sb
323 return changed, added, removed 323 return changed, added, removed
324 324
325 def file_checksums_diff(a, b): 325 def file_checksums_diff(a, b):
@@ -411,21 +411,21 @@ def compare_sigfiles(a, b, recursecb = None):
411 bdep_found = False 411 bdep_found = False
412 if removed: 412 if removed:
413 for bdep in removed: 413 for bdep in removed:
414 if a[dep] == b[bdep]: 414 if b[dep] == a[bdep]:
415 #output.append("Dependency on task %s was replaced by %s with same hash" % (dep, bdep)) 415 #output.append("Dependency on task %s was replaced by %s with same hash" % (dep, bdep))
416 bdep_found = True 416 bdep_found = True
417 if not bdep_found: 417 if not bdep_found:
418 output.append("Dependency on task %s was added with hash %s" % (clean_basepath(dep), a[dep])) 418 output.append("Dependency on task %s was added with hash %s" % (clean_basepath(dep), b[dep]))
419 if removed: 419 if removed:
420 for dep in removed: 420 for dep in removed:
421 adep_found = False 421 adep_found = False
422 if added: 422 if added:
423 for adep in added: 423 for adep in added:
424 if a[adep] == b[dep]: 424 if b[adep] == a[dep]:
425 #output.append("Dependency on task %s was replaced by %s with same hash" % (adep, dep)) 425 #output.append("Dependency on task %s was replaced by %s with same hash" % (adep, dep))
426 adep_found = True 426 adep_found = True
427 if not adep_found: 427 if not adep_found:
428 output.append("Dependency on task %s was removed with hash %s" % (clean_basepath(dep), b[dep])) 428 output.append("Dependency on task %s was removed with hash %s" % (clean_basepath(dep), a[dep]))
429 if changed: 429 if changed:
430 for dep in changed: 430 for dep in changed:
431 output.append("Hash for dependent task %s changed from %s to %s" % (clean_basepath(dep), a[dep], b[dep])) 431 output.append("Hash for dependent task %s changed from %s to %s" % (clean_basepath(dep), a[dep], b[dep]))