From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3E950C433EF for ; Tue, 19 Jul 2022 09:11:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235161AbiGSJLF (ORCPT ); Tue, 19 Jul 2022 05:11:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41826 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235192AbiGSJLD (ORCPT ); Tue, 19 Jul 2022 05:11:03 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 73DA2248FA for ; Tue, 19 Jul 2022 02:11:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1658221859; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=9vPPI7ZUWMHCXVE/wfNkcYC23Asc4kunoqMVl9ZovKo=; b=Bd8pr5FcLC7+tb8yDVZoovQEvN5GQ9Z9IwSf2CodCo4S/zULxyfdZ4/tJRHTG24iBybyyn YSGZjzCnbG/QMpTIsF4u6aqq3KlYI7vBc0dElJf2J2ZClwATEYwlXf9f2MnuKkZ/HwpLlh Q8JFcxi0XK6avVyFL5SzLZGG36s1pAE= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-576-VOfLtY3eMiC3R8QRyIVQzA-1; Tue, 19 Jul 2022 05:10:58 -0400 X-MC-Unique: VOfLtY3eMiC3R8QRyIVQzA-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id B08993810793; Tue, 19 Jul 2022 09:10:57 +0000 (UTC) Received: from localhost (unknown [10.40.192.109]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4CB26492C3B; Tue, 19 Jul 2022 09:10:57 +0000 (UTC) From: Petr Lautrbach To: Elijah Conners , selinux Subject: Re: [PATCH] python: remove IOError in certain cases In-Reply-To: <875yjtjwrr.fsf@redhat.com> References: <1816aee4f80.1026d4b311254470.8507588530121880177@elijahpepe.com> <875yjtjwrr.fsf@redhat.com> Date: Tue, 19 Jul 2022 11:10:56 +0200 Message-ID: <8735exjwm7.fsf@redhat.com> MIME-Version: 1.0 Content-Type: text/plain X-Scanned-By: MIMEDefang 2.85 on 10.11.54.9 Precedence: bulk List-ID: X-Mailing-List: selinux@vger.kernel.org Petr Lautrbach writes: > Elijah Conners writes: > >> In certain cases, IOError caused the much more general exception OSError >> to be unreachable. >> >> Signed-off-by: Elijah Conners > > Acked-by: Petr Lautrbach > Merged, thanks! >> --- >> python/semanage/semanage | 7 ++----- >> sandbox/sandbox | 2 -- >> 2 files changed, 2 insertions(+), 7 deletions(-) >> >> diff --git a/python/semanage/semanage b/python/semanage/semanage >> index 1d828128..c7a35fe4 100644 >> --- a/python/semanage/semanage >> +++ b/python/semanage/semanage >> @@ -970,8 +970,8 @@ def do_parser(): >> devnull = os.open(os.devnull, os.O_WRONLY) >> os.dup2(devnull, sys.stdout.fileno()) >> sys.exit(1) >> - except IOError as e: >> - sys.stderr.write("%s: %s\n" % (e.__class__.__name__, str(e))) >> + except OSError as e: >> + sys.stderr.write("%s: %s\n" % (e.__class__.__name__, e.args[1])) >> sys.exit(1) >> except KeyboardInterrupt: >> sys.exit(0) >> @@ -981,9 +981,6 @@ def do_parser(): >> except KeyError as e: >> sys.stderr.write("%s: %s\n" % (e.__class__.__name__, e.args[0])) >> sys.exit(1) >> - except OSError as e: >> - sys.stderr.write("%s: %s\n" % (e.__class__.__name__, e.args[1])) >> - sys.exit(1) >> except RuntimeError as e: >> sys.stderr.write("%s: %s\n" % (e.__class__.__name__, e.args[0])) >> sys.exit(1) >> diff --git a/sandbox/sandbox b/sandbox/sandbox >> index cd5709fb..1c9379ef 100644 >> --- a/sandbox/sandbox >> +++ b/sandbox/sandbox >> @@ -533,8 +533,6 @@ if __name__ == '__main__': >> error_exit(error.args[0]) >> except KeyError as error: >> error_exit(_("Invalid value %s") % error.args[0]) >> - except IOError as error: >> - error_exit(error) >> except KeyboardInterrupt: >> rc = 0 >> >> -- >> 2.29.2.windows.2