File 0001-Avoid-calling-close-on-undefined-fd-variab... of Package rpmlint-tests

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-Avoid-calling-close-on-undefined-fd-variable.patch of Package rpmlint-tests (Revision 6659c5373e85b7e78b646110007c2b3b)

Currently displaying revision 6659c5373e85b7e78b646110007c2b3b , Show latest

From 49611f900047d5397ebbbdb0ed5299580337ea34 Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dirk@dmllr.de>
Date: Wed, 1 Nov 2017 13:59:01 +0100
Subject: [PATCH] Avoid calling close on undefined fd variable

It can happen that open did through an OSError but then the
corresponding close UnknownVariableError wasn't caught. we
can fix that by putting both in the same try/exception block,
which also cleans up the code a bit.
---
 Pkg.py | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/Pkg.py b/Pkg.py
index 47197c9..2622f9a 100644
--- a/Pkg.py
+++ b/Pkg.py
@@ -719,16 +719,11 @@ class Pkg(AbstractPkg):
                     # use descriptor() method instead
                     try:
                         fd = os.open(pkgfile.path, os.O_RDONLY)
-                    except OSError:
-                        if not pkgfile.is_ghost:
-                            raise
-                    else:
                         pkgfile.magic = b2s(_magic.descriptor(fd))
-                    # libmagic up to 5.18 already closes the descriptor
-                    try:
                         os.close(fd)
                     except OSError:
-                        pass
+                        if not pkgfile.is_ghost:
+                            raise
                 if pkgfile.magic is None:
                     pkgfile.magic = ''
                 elif Pkg._magic_from_compressed_re.search(pkgfile.magic):
-- 
2.14.2

Places

File 0001-Avoid-calling-close-on-undefined-fd-variable.patch of Package rpmlint-tests (Revision 6659c5373e85b7e78b646110007c2b3b)

Places