Bug#850758: diffoscope: redundant undecoded AndroidManifest.xml (Binary XML) comparison in APK comparator

[Maria Glukhova]

On 10.01.2017 01:13, Emanuel Bronshtein wrote:
> The result of comparing AndroidManifest.xml (Binary XML) file from APK file in apk.py comparator is shown twice, 
> first, as AndroidManifest.xml (XML file decoded from original file by apktool)
> second, as original/AndroidManifest.xml (the original undecoded binary file)
>
> fix:
> 	1. if there is a difference in decoded AndroidManifest.xml file, remove the original/AndroidManifest.xml.
> 	   if there is no difference in AndroidManifest.xml but original/AndroidManifest.xml differ, show "No file format specific differences found inside, yet data differs" message (which shown by diffoscope in similar scenarios [when tool failed to find differences])
>
> 	2. it will be better to indicate the AndroidManifest.xml type, such as for example:
> 		show AndroidManifest.xml          as "AndroidManifest.xml (decoded)"
> 		show original/AndroidManifest.xml as "AndroidManifest.xml (original / undecoded)"

Thanks; Implemented in the attached patches.
Would appreciate if someone reviewed that.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-Improve-AndroidManifest.xml-comparison-for-APK-files.patch
Type: text/x-patch
Size: 5386 bytes
Desc: not available
URL: <http://lists.alioth.debian.org/pipermail/reproducible-builds/attachments/20170306/96669077/attachment.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0002-Indicate-the-AndroidManifest.xml-type.patch
Type: text/x-patch
Size: 4258 bytes
Desc: not available
URL: <http://lists.alioth.debian.org/pipermail/reproducible-builds/attachments/20170306/96669077/attachment-0001.bin>