From c71be262608885d7a556b600bb72fa0419f9f044b1847c5cd5d403baf6b906ae Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Sat, 2 Feb 2019 08:28:03 +0000 Subject: [PATCH] - add 0001-ZipCheck-Also-ignore-RuntimeError.patch (bscs#1124054) OBS-URL: https://build.opensuse.org/package/show/devel:openSUSE:Factory:rpmlint/rpmlint?expand=0&rev=654 --- 0001-ZipCheck-Also-ignore-RuntimeError.patch | 31 ++++++++++++++++++++ rpmlint.changes | 5 ++++ rpmlint.spec | 1 + 3 files changed, 37 insertions(+) create mode 100644 0001-ZipCheck-Also-ignore-RuntimeError.patch diff --git a/0001-ZipCheck-Also-ignore-RuntimeError.patch b/0001-ZipCheck-Also-ignore-RuntimeError.patch new file mode 100644 index 0000000..0322757 --- /dev/null +++ b/0001-ZipCheck-Also-ignore-RuntimeError.patch @@ -0,0 +1,31 @@ +From c5dd20d7e48f4c441fe1cc3f451b184d6b31c074 Mon Sep 17 00:00:00 2001 +From: Dirk Mueller +Date: Sat, 2 Feb 2019 09:19:45 +0100 +Subject: [PATCH] ZipCheck: Also ignore RuntimeError + +When there is a unpack error, we need to catch it. Potential +reasons are : NotImplementedError (which happens on compression +type issues) or RuntimeError (e.g for encrypted zip files). + +This issue is already fixed in master in a non-backportable +way, so a new fix has been done on stable. +--- + ZipCheck.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ZipCheck.py b/ZipCheck.py +index a6f927a..4da6b06 100644 +--- a/ZipCheck.py ++++ b/ZipCheck.py +@@ -43,7 +43,7 @@ class ZipCheck(AbstractCheck.AbstractCheck): + badcrc = z.testzip() + if badcrc: + printError(pkg, 'bad-crc-in-zip', badcrc, fname) +- except zipfile.error: ++ except (RuntimeError, zipfile.error): + printWarning(pkg, 'unable-to-read-zip', '%s: %s' % + (fname, sys.exc_info()[1])) + else: +-- +2.20.1 + diff --git a/rpmlint.changes b/rpmlint.changes index 8a86678..80ea01a 100644 --- a/rpmlint.changes +++ b/rpmlint.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Feb 2 08:23:39 UTC 2019 - Dirk Mueller + +- add 0001-ZipCheck-Also-ignore-RuntimeError.patch (bscs#1124054) + ------------------------------------------------------------------- Mon Jan 14 08:23:01 UTC 2019 - Dirk Mueller diff --git a/rpmlint.spec b/rpmlint.spec index e1a7667..b83d724 100644 --- a/rpmlint.spec +++ b/rpmlint.spec @@ -48,6 +48,7 @@ Patch25: yast-provides.diff Patch29: rpmgroup-checks.diff Patch30: devel-provide-is-devel-package.diff Patch31: only-reg-files-are-scripts.diff +Patch32: 0001-ZipCheck-Also-ignore-RuntimeError.patch Patch40: no-badness-return.diff Patch41: suse-shlib-devel-dependency.diff Patch49: extend-suse-conffiles-check.diff