Lines 1-28
Link Here
|
1 |
# Non-portable regression caused by 25fee28c/#879011 |
|
|
2 |
# https://lists.reproducible-builds.org/pipermail/diffoscope/2020-March/002632.html |
3 |
# TODO: Upstream |
4 |
|
5 |
--- diffoscope/comparators/zip.py.orig 2020-03-12 13:23:59 UTC |
6 |
+++ diffoscope/comparators/zip.py |
7 |
@@ -38,10 +38,7 @@ from .utils.command import Command |
8 |
class Zipinfo(Command): |
9 |
@tool_required('zipinfo') |
10 |
def cmdline(self): |
11 |
- # zipinfo (without -v) puts warning messages (some of which contain |
12 |
- # $path) into stdin when stderr is not a tty, see #879011 for details. |
13 |
- # to work around it, we run it on /dev/stdin instead, seems to work ok. |
14 |
- return ['zipinfo', '/dev/stdin'] |
15 |
+ return ['zipinfo', self.path] |
16 |
|
17 |
@property |
18 |
def returncode(self): |
19 |
@@ -54,9 +51,6 @@ class Zipinfo(Command): |
20 |
returncode = 0 |
21 |
|
22 |
return returncode |
23 |
- |
24 |
- def stdin(self): |
25 |
- return open(self.path, 'rb') |
26 |
|
27 |
def filter(self, line): |
28 |
# we don't care about the archive file path |