Gentoo Archives: gentoo-commits

From: James Le Cuirot <chewi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/eselect-java:master commit in: src/modules/, /
Date: Wed, 03 Jan 2018 22:51:15
Message-Id: 1514497082.60ae07aea7854d30bb44107733ed34c2846b2663.chewi@gentoo
1 commit: 60ae07aea7854d30bb44107733ed34c2846b2663
2 Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
3 AuthorDate: Sat Dec 23 18:56:21 2017 +0000
4 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
5 CommitDate: Thu Dec 28 21:38:02 2017 +0000
6 URL: https://gitweb.gentoo.org/proj/eselect-java.git/commit/?id=60ae07ae
7
8 Don't emit (unset) or (not a symlink) on stderr (bug #549498)
9
10 NEWS | 4 ++++
11 src/modules/ecj.eselect.in | 6 +++---
12 src/modules/maven.eselect.in | 6 +++---
13 3 files changed, 10 insertions(+), 6 deletions(-)
14
15 diff --git a/NEWS b/NEWS
16 index cb1a799..669548f 100644
17 --- a/NEWS
18 +++ b/NEWS
19 @@ -1,3 +1,7 @@
20 +0.4.0:
21 +
22 + * Don't emit (unset) or (not a symlink) on stderr (#549498)
23 +
24 0.3.0:
25
26 * run-java-tool.bash.in: fix shellcheck issues
27
28 diff --git a/src/modules/ecj.eselect.in b/src/modules/ecj.eselect.in
29 index f9d5057..7b6d784 100644
30 --- a/src/modules/ecj.eselect.in
31 +++ b/src/modules/ecj.eselect.in
32 @@ -1,5 +1,5 @@
33 # -*-eselect-*- vim: ft=eselect
34 -# Copyright 1999-2012 Gentoo Foundation
35 +# Copyright 1999-2017 Gentoo Foundation
36 # Distributed under the terms of the GNU General Public License v2
37
38 DESCRIPTION="Manage ECJ targets"
39 @@ -57,10 +57,10 @@ do_show() {
40 get_target
41 return 0
42 elif [[ -e "${ECJ}" ]] ; then
43 - echo "(not a symlink)" >&2
44 + echo "(not a symlink)"
45 return 1
46 else
47 - echo "(unset)" >&2
48 + echo "(unset)"
49 return 1
50 fi
51 }
52
53 diff --git a/src/modules/maven.eselect.in b/src/modules/maven.eselect.in
54 index 976e02c..f0cf2e4 100644
55 --- a/src/modules/maven.eselect.in
56 +++ b/src/modules/maven.eselect.in
57 @@ -1,5 +1,5 @@
58 # -*-eselect-*- vim: ft=eselect
59 -# Copyright 1999-2012 Gentoo Foundation
60 +# Copyright 1999-2017 Gentoo Foundation
61 # Distributed under the terms of the GNU General Public License v2
62
63 DESCRIPTION="Manage Maven targets"
64 @@ -67,10 +67,10 @@ do_show() {
65 get_target
66 return 0
67 elif [[ -e "${MVN}" ]] ; then
68 - echo "(not a symlink)" >&2
69 + echo "(not a symlink)"
70 return 1
71 else
72 - echo "(unset)" >&2
73 + echo "(unset)"
74 return 1
75 fi
76 }