Attachment 212350 Details for Bug 244750 – Patch against /usr/ports

[patch] Patch against /usr/ports

diffoscope-portability.patch (text/plain), 1.53 KB, created by Michael Osipov on 2020-03-12 13:43:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Osipov

Created: 2020-03-12 13:43:11 UTC

Size: 1.53 KB

patch

obsolete

>Index: sysutils/py-diffoscope/files/patch-diffoscope_comparators_zip.py
>===================================================================
>--- sysutils/py-diffoscope/files/patch-diffoscope_comparators_zip.py	(nonexistent)
>+++ sysutils/py-diffoscope/files/patch-diffoscope_comparators_zip.py	(working copy)
>@@ -0,0 +1,24 @@
>+--- diffoscope/comparators/zip.py.orig	2020-03-12 13:23:59 UTC
>++++ diffoscope/comparators/zip.py
>+@@ -38,10 +38,7 @@ from .utils.command import Command
>+ class Zipinfo(Command):
>+     @tool_required('zipinfo')
>+     def cmdline(self):
>+-        # zipinfo (without -v) puts warning messages (some of which contain
>+-        # $path) into stdin when stderr is not a tty, see #879011 for details.
>+-        # to work around it, we run it on /dev/stdin instead, seems to work ok.
>+-        return ['zipinfo', '/dev/stdin']
>++        return ['zipinfo', self.path]
>+ 
>+     @property
>+     def returncode(self):
>+@@ -54,9 +51,6 @@ class Zipinfo(Command):
>+             returncode = 0
>+ 
>+         return returncode
>+-
>+-    def stdin(self):
>+-        return open(self.path, 'rb')
>+ 
>+     def filter(self, line):
>+         # we don't care about the archive file path
>
>Property changes on: sysutils/py-diffoscope/files/patch-diffoscope_comparators_zip.py
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 244750: 212350