[diffoscope] 02/02: Correctly parse squashfs device entries with device minors larger than 3 digits

[Jérémy Bobbio]

This is an automated email from the git hooks/post-receive script.

lunar pushed a commit to branch master
in repository diffoscope.

commit cdcc1dd510320cc2a5be98d919a6842403e6e2f8
Author: Jérémy Bobbio <lunar at debian.org>
Date:   Mon Dec 28 12:13:12 2015 +0100

    Correctly parse squashfs device entries with device minors larger than 3 digits
    
    Thanks sajolida for providing the samples.
---
 diffoscope/comparators/squashfs.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/diffoscope/comparators/squashfs.py b/diffoscope/comparators/squashfs.py
index bd8d774..9e5216b 100644
--- a/diffoscope/comparators/squashfs.py
+++ b/diffoscope/comparators/squashfs.py
@@ -126,7 +126,7 @@ class SquashfsSymlink(Symlink, SquashfsMember):
 class SquashfsDevice(Device, SquashfsMember):
     # Example line:
     # crw-r--r-- root/root  1,  3 2015-06-24 14:47 squashfs-root/null
-    LINE_RE = re.compile(r'^(?P<kind>c|b)\S+\s+\S+\s+(?P<major>\d+),\s+(?P<minor>\d+)\s+\S+\s+\S+\s+(?P<member_name>.*)$')
+    LINE_RE = re.compile(r'^(?P<kind>c|b)\S+\s+\S+\s+(?P<major>\d+),\s*(?P<minor>\d+)\s+\S+\s+\S+\s+(?P<member_name>.*)$')
 
     KIND_MAP = { 'c': stat.S_IFCHR,
                  'b': stat.S_IFBLK,

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/diffoscope.git