From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 652ACA04B1 for ; Mon, 23 Nov 2020 18:12:57 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 5E862C906; Mon, 23 Nov 2020 18:12:56 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by dpdk.org (Postfix) with ESMTP id 42586C904 for ; Mon, 23 Nov 2020 18:12:54 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1606151572; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=pZdvPOSzQEYzfVDUXhXGgS/TlXXaAZOOTJ9DUVLME/M=; b=GZpYhjtTR949jYKHu+2BhoJVMkfJfmzlK2ebQbAeCZ5NZBTkIfiwNxG3SBLfPcWbWh4bUS F9KhoMK+Drb1Rt4PcxxIzNhv2nhgK1wVT/Ha7FZbqfWzwjsrlUBSUMG/AQsd0ITP8i/VnG 8dqfHEa2IqpazScK+nUhUtMYoT+hWl0= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-479-4kDBK_-MPyemnEOB5ff6vQ-1; Mon, 23 Nov 2020 12:12:46 -0500 X-MC-Unique: 4kDBK_-MPyemnEOB5ff6vQ-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id CDC1A9A22A; Mon, 23 Nov 2020 17:12:45 +0000 (UTC) Received: from rh.redhat.com (ovpn-112-19.ams2.redhat.com [10.36.112.19]) by smtp.corp.redhat.com (Postfix) with ESMTP id 006B760C04; Mon, 23 Nov 2020 17:12:44 +0000 (UTC) From: Kevin Traynor To: Ciara Power Cc: dpdk stable Date: Mon, 23 Nov 2020 17:11:56 +0000 Message-Id: <20201123171222.79398-4-ktraynor@redhat.com> In-Reply-To: <20201123171222.79398-1-ktraynor@redhat.com> References: <20201123171222.79398-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Subject: [dpdk-stable] patch 'usertools: fix CPU layout script to be PEP8 compliant' has been queued to LTS release 18.11.11 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to LTS release 18.11.11 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/27/20. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/e60a2598ccf13c3492a56288ab6808c248510c36 Thanks. Kevin. --- >From e60a2598ccf13c3492a56288ab6808c248510c36 Mon Sep 17 00:00:00 2001 From: Ciara Power Date: Fri, 6 Nov 2020 12:40:53 +0000 Subject: [PATCH] usertools: fix CPU layout script to be PEP8 compliant [ upstream commit b0dcd610529487ed6661351a735a35af5d03a222 ] The pycodestyle tool flagged the following issues, which are now fixed. $ pycodestyle cpu_layout.py cpu_layout.py:18:5: E722 do not use bare 'except' cpu_layout.py:62:14: E231 missing whitespace after ',' Fixes: deb87e6777c0 ("usertools: use sysfs for CPU layout") Fixes: c9208f1dc967 ("usertools: fix CPU layout with python 3") Signed-off-by: Ciara Power --- usertools/cpu_layout.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/usertools/cpu_layout.py b/usertools/cpu_layout.py index 6f129b1db8..39b268752a 100755 --- a/usertools/cpu_layout.py +++ b/usertools/cpu_layout.py @@ -23,6 +23,4 @@ for cpu in xrange(max_cpus + 1): except IOError: continue - except: - break core = int(fd.read()) fd.close() @@ -67,5 +65,5 @@ for c in cores: output = "Core %s" % str(c).ljust(max_core_id_len) for s in sockets: - if (s,c) in core_map: + if (s, c) in core_map: output += " " + str(core_map[(s, c)]).ljust(max_core_map_len) else: -- 2.26.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-11-23 17:10:14.101072523 +0000 +++ 0004-usertools-fix-CPU-layout-script-to-be-PEP8-compliant.patch 2020-11-23 17:10:13.970061559 +0000 @@ -1 +1 @@ -From b0dcd610529487ed6661351a735a35af5d03a222 Mon Sep 17 00:00:00 2001 +From e60a2598ccf13c3492a56288ab6808c248510c36 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit b0dcd610529487ed6661351a735a35af5d03a222 ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -22 +23 @@ -index cc39638213..891b9238fa 100755 +index 6f129b1db8..39b268752a 100755 @@ -25 +26 @@ -@@ -16,6 +16,4 @@ for cpu in range(max_cpus + 1): +@@ -23,6 +23,4 @@ for cpu in xrange(max_cpus + 1): @@ -32 +33 @@ -@@ -60,5 +58,5 @@ for c in cores: +@@ -67,5 +65,5 @@ for c in cores: