diff options
-rwxr-xr-x | bitbake/bin/bitbake-diffsigs | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/bitbake/bin/bitbake-diffsigs b/bitbake/bin/bitbake-diffsigs index f84188d57f..5400e5b92b 100755 --- a/bitbake/bin/bitbake-diffsigs +++ b/bitbake/bin/bitbake-diffsigs | |||
@@ -37,12 +37,6 @@ logger = bb.msg.logger_create('bitbake-diffsigs') | |||
37 | def find_compare_task(bbhandler, pn, taskname): | 37 | def find_compare_task(bbhandler, pn, taskname): |
38 | """ Find the most recent signature files for the specified PN/task and compare them """ | 38 | """ Find the most recent signature files for the specified PN/task and compare them """ |
39 | 39 | ||
40 | def get_hashval(siginfo): | ||
41 | if siginfo.endswith('.siginfo'): | ||
42 | return siginfo.rpartition(':')[2].partition('_')[0] | ||
43 | else: | ||
44 | return siginfo.rpartition('.')[2] | ||
45 | |||
46 | if not hasattr(bb.siggen, 'find_siginfo'): | 40 | if not hasattr(bb.siggen, 'find_siginfo'): |
47 | logger.error('Metadata does not support finding signature data files') | 41 | logger.error('Metadata does not support finding signature data files') |
48 | sys.exit(1) | 42 | sys.exit(1) |
@@ -59,16 +53,6 @@ def find_compare_task(bbhandler, pn, taskname): | |||
59 | logger.error('Only one matching sigdata file found for the specified task (%s %s)' % (pn, taskname)) | 53 | logger.error('Only one matching sigdata file found for the specified task (%s %s)' % (pn, taskname)) |
60 | sys.exit(1) | 54 | sys.exit(1) |
61 | else: | 55 | else: |
62 | # It's possible that latestfiles contain 3 elements and the first two have the same hash value. | ||
63 | # In this case, we delete the second element. | ||
64 | # The above case is actually the most common one. Because we may have sigdata file and siginfo | ||
65 | # file having the same hash value. Comparing such two files makes no sense. | ||
66 | if len(latestfiles) == 3: | ||
67 | hash0 = get_hashval(latestfiles[0]) | ||
68 | hash1 = get_hashval(latestfiles[1]) | ||
69 | if hash0 == hash1: | ||
70 | latestfiles.pop(1) | ||
71 | |||
72 | # Define recursion callback | 56 | # Define recursion callback |
73 | def recursecb(key, hash1, hash2): | 57 | def recursecb(key, hash1, hash2): |
74 | hashes = [hash1, hash2] | 58 | hashes = [hash1, hash2] |