From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 67EEB138334 for ; Sat, 31 Aug 2019 03:42:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1D2C8E081B; Sat, 31 Aug 2019 03:42:41 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8A3BFE0809 for ; Sat, 31 Aug 2019 03:42:40 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1953034A739 for ; Sat, 31 Aug 2019 03:42:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 834E74D3 for ; Sat, 31 Aug 2019 03:42:36 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1567221241.42787293f725536abaa6b92605e48daae750e803.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: bin/ X-VCS-Repository: proj/portage X-VCS-Files: bin/glsa-check X-VCS-Directories: bin/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 42787293f725536abaa6b92605e48daae750e803 X-VCS-Branch: master Date: Sat, 31 Aug 2019 03:42:36 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: f90c9635-a77c-41bc-9f26-17995eeaec44 X-Archives-Hash: 83ee9a2f2a1cbd261a430fec86faeeb4 commit: 42787293f725536abaa6b92605e48daae750e803 Author: Zac Medico gentoo org> AuthorDate: Fri Aug 30 22:14:43 2019 +0000 Commit: Zac Medico gentoo org> CommitDate: Sat Aug 31 03:14:01 2019 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=42787293 glsa-check: Fix traceback with glsa-check -f (Bug 275105) This patch is a forward port of the following commit: https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=232d69fa230abb490e0b0f8eef550f28745be6a3 commit 232d69fa230abb490e0b0f8eef550f28745be6a3 Author: fuzzyray gentoo.org> AuthorDate: 2009-06-22 20:45:49 +0000 Commit: fuzzyray gentoo.org> CommitDate: 2009-06-22 20:45:49 +0000 Fix traceback with glsa-check -f (Bug 275105) svn path=/trunk/gentoolkit/; revision=665 Bug: https://bugs.gentoo.org/693088 Acked-by: Aaron Bauman gentoo.org> Signed-off-by: Zac Medico gentoo.org> bin/glsa-check | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/glsa-check b/bin/glsa-check index f6c744d84..3502812d9 100755 --- a/bin/glsa-check +++ b/bin/glsa-check @@ -248,8 +248,8 @@ if mode in ["dump", "fix", "inject", "pretend"]: exitcode >>= 8 if exitcode: sys.exit(exitcode) - if len(mergelist): - sys.stdout.write("\n") + if len(mergelist): + sys.stdout.write("\n") elif mode == "pretend": if not quiet: sys.stdout.write("Checking GLSA "+myid+"\n")