diff options
| author | Alexander Ried <ried@mytum.de> | 2016-04-28 15:21:40 +0200 |
|---|---|---|
| committer | Alexander Ried <ried@mytum.de> | 2016-04-28 16:21:23 +0200 |
| commit | 2e320a58b3f8749396148e9c663e74f0c5569dde (patch) | |
| tree | 57ec4152aa0d78073d7e12c4cab5fb55f3b7b61d /pkgs/tools/misc/diffoscope/ignore_links.patch | |
| parent | dcde0265a8c369361ff7be9a28f158b2d4bdadb8 (diff) | |
| download | nixpkgs-2e320a58b3f8749396148e9c663e74f0c5569dde.tar nixpkgs-2e320a58b3f8749396148e9c663e74f0c5569dde.tar.gz nixpkgs-2e320a58b3f8749396148e9c663e74f0c5569dde.tar.bz2 nixpkgs-2e320a58b3f8749396148e9c663e74f0c5569dde.tar.lz nixpkgs-2e320a58b3f8749396148e9c663e74f0c5569dde.tar.xz nixpkgs-2e320a58b3f8749396148e9c663e74f0c5569dde.tar.zst nixpkgs-2e320a58b3f8749396148e9c663e74f0c5569dde.zip | |
diffoscope: 49 -> 52
Diffstat (limited to 'pkgs/tools/misc/diffoscope/ignore_links.patch')
| -rw-r--r-- | pkgs/tools/misc/diffoscope/ignore_links.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/pkgs/tools/misc/diffoscope/ignore_links.patch b/pkgs/tools/misc/diffoscope/ignore_links.patch new file mode 100644 index 00000000000..4e5046390fa --- /dev/null +++ b/pkgs/tools/misc/diffoscope/ignore_links.patch @@ -0,0 +1,25 @@ +From: Eelco Dolstra <eelco.dolstra@logicblox.com> + +Nix deduplicates by hard-linking identical files, so it's normal for +the the number of links to a file to differ. +--- +diff --git a/diffoscope/comparators/directory.py b/diffoscope/comparators/directory.py +index 7d1cd75..bd91eb0 100644 +--- a/diffoscope/comparators/directory.py ++++ b/diffoscope/comparators/directory.py +@@ -47,6 +47,7 @@ class Stat(Command): + FILE_RE = re.compile(r'^\s*File:.*$') + DEVICE_RE = re.compile(r'Device: [0-9a-f]+h/[0-9]+d') + INODE_RE = re.compile(r'Inode: [0-9]+') ++ LINKS_RE = re.compile(r'Links: [0-9]+') + ACCESS_TIME_RE = re.compile(r'^Access: [0-9]{4}-[0-9]{2}-[0-9]{2}.*$') + CHANGE_TIME_RE = re.compile(r'^Change: [0-9]{4}-[0-9]{2}-[0-9]{2}.*$') + +@@ -55,6 +56,7 @@ class Stat(Command): + line = Stat.FILE_RE.sub('', line) + line = Stat.DEVICE_RE.sub('', line) + line = Stat.INODE_RE.sub('', line) ++ line = Stat.LINKS_RE.sub('', line) + line = Stat.ACCESS_TIME_RE.sub('', line) + line = Stat.CHANGE_TIME_RE.sub('', line) + return line.encode('utf-8') |