Gentoo Archives: gentoo-commits

From: Zac Medico <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/portage:master commit in: bin/
Date: Sat, 31 Aug 2019 03:42:42
Message-Id: 1567221241.42787293f725536abaa6b92605e48daae750e803.zmedico@gentoo
1 commit: 42787293f725536abaa6b92605e48daae750e803
2 Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3 AuthorDate: Fri Aug 30 22:14:43 2019 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Sat Aug 31 03:14:01 2019 +0000
6 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=42787293
7
8 glsa-check: Fix traceback with glsa-check -f (Bug 275105)
9
10 This patch is a forward port of the following commit:
11
12 https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=232d69fa230abb490e0b0f8eef550f28745be6a3
13
14 commit 232d69fa230abb490e0b0f8eef550f28745be6a3
15 Author: fuzzyray <fuzzyray <AT> gentoo.org>
16 AuthorDate: 2009-06-22 20:45:49 +0000
17 Commit: fuzzyray <fuzzyray <AT> gentoo.org>
18 CommitDate: 2009-06-22 20:45:49 +0000
19
20 Fix traceback with glsa-check -f (Bug 275105)
21
22 svn path=/trunk/gentoolkit/; revision=665
23
24 Bug: https://bugs.gentoo.org/693088
25 Acked-by: Aaron Bauman <bman <AT> gentoo.org>
26 Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
27
28 bin/glsa-check | 4 ++--
29 1 file changed, 2 insertions(+), 2 deletions(-)
30
31 diff --git a/bin/glsa-check b/bin/glsa-check
32 index f6c744d84..3502812d9 100755
33 --- a/bin/glsa-check
34 +++ b/bin/glsa-check
35 @@ -248,8 +248,8 @@ if mode in ["dump", "fix", "inject", "pretend"]:
36 exitcode >>= 8
37 if exitcode:
38 sys.exit(exitcode)
39 - if len(mergelist):
40 - sys.stdout.write("\n")
41 + if len(mergelist):
42 + sys.stdout.write("\n")
43 elif mode == "pretend":
44 if not quiet:
45 sys.stdout.write("Checking GLSA "+myid+"\n")