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 E29A4A2E1B for ; Thu, 5 Sep 2019 12:19:44 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id DB3191EF9D; Thu, 5 Sep 2019 12:19:44 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 356B61EF93 for ; Thu, 5 Sep 2019 12:19:43 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A25BD10C6976; Thu, 5 Sep 2019 10:19:42 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-52.ams2.redhat.com [10.36.117.52]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9154619C6A; Thu, 5 Sep 2019 10:19:41 +0000 (UTC) From: Kevin Traynor To: Andrius Sirvys Cc: Harry van Haaren , dpdk stable Date: Thu, 5 Sep 2019 11:17:54 +0100 Message-Id: <20190905101754.21933-54-ktraynor@redhat.com> In-Reply-To: <20190905101754.21933-1-ktraynor@redhat.com> References: <20190905101754.21933-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.65]); Thu, 05 Sep 2019 10:19:42 +0000 (UTC) Subject: [dpdk-stable] patch 'usertools: fix input handling in telemetry script' has been queued to LTS release 18.11.3 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.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 09/12/19. 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/791dcd207781bf740167b8d449d452f01aca5ff9 Thanks. Kevin Traynor --- >From 791dcd207781bf740167b8d449d452f01aca5ff9 Mon Sep 17 00:00:00 2001 From: Andrius Sirvys Date: Thu, 8 Aug 2019 15:37:52 +0100 Subject: [PATCH] usertools: fix input handling in telemetry script [ upstream commit a667070b09bb8cfbd83912045391d877ed88725e ] This commit removes the unnecesarry ast.literal_eval() function call from the input handling, which now relies just on raw_input() to get its input. Fixes: 53f293c9a783 ("usertools: replace unsafe input function") Signed-off-by: Andrius Sirvys Acked-by: Harry van Haaren --- usertools/dpdk-telemetry-client.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usertools/dpdk-telemetry-client.py b/usertools/dpdk-telemetry-client.py index 4afa2f84c..e0587022c 100644 --- a/usertools/dpdk-telemetry-client.py +++ b/usertools/dpdk-telemetry-client.py @@ -77,5 +77,5 @@ class Client: def repeatedlyRequestMetrics(self, sleep_time): # Recursively requests metrics for given client print("\nPlease enter the number of times you'd like to continuously request Metrics:") - n_requests = int(ast.literal_eval(raw_input("\n:"))) + n_requests = int(raw_input("\n:")) print("\033[F") #Removes the user input from screen, cleans it up print("\033[K") @@ -92,5 +92,5 @@ class Client: try: - self.choice = int(ast.literal_eval(raw_input("\n:"))) + self.choice = int(raw_input("\n:")) print("\033[F") #Removes the user input for screen, cleans it up print("\033[K") -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-09-05 10:36:50.780788204 +0100 +++ 0054-usertools-fix-input-handling-in-telemetry-script.patch 2019-09-05 10:36:47.568699134 +0100 @@ -1 +1 @@ -From a667070b09bb8cfbd83912045391d877ed88725e Mon Sep 17 00:00:00 2001 +From 791dcd207781bf740167b8d449d452f01aca5ff9 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit a667070b09bb8cfbd83912045391d877ed88725e ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index 4b0502ff9..60fe97af7 100755 +index 4afa2f84c..e0587022c 100644 @@ -23 +24 @@ -@@ -79,5 +79,5 @@ class Client: +@@ -77,5 +77,5 @@ class Client: @@ -30 +31 @@ -@@ -100,5 +100,5 @@ class Client: +@@ -92,5 +92,5 @@ class Client: