Gentoo Archives: gentoo-commits

From: "Manuel Rueger (mrueg)" <mrueg@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog ruby-ng.eclass
Date: Mon, 29 Jun 2015 11:01:53
Message-Id: 20150629110131.7CA84744@oystercatcher.gentoo.org
1 mrueg 15/06/29 11:01:31
2
3 Modified: ChangeLog ruby-ng.eclass
4 Log:
5 Quote RUBY_S and sub_S as the directory could contain spaces.
6
7 Revision Changes Path
8 1.1695 eclass/ChangeLog
9
10 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1695&view=markup
11 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1695&content-type=text/plain
12 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1694&r2=1.1695
13
14 Index: ChangeLog
15 ===================================================================
16 RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
17 retrieving revision 1.1694
18 retrieving revision 1.1695
19 diff -u -r1.1694 -r1.1695
20 --- ChangeLog 29 Jun 2015 00:27:17 -0000 1.1694
21 +++ ChangeLog 29 Jun 2015 11:01:31 -0000 1.1695
22 @@ -1,6 +1,9 @@
23 # ChangeLog for eclass directory
24 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
25 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1694 2015/06/29 00:27:17 pesa Exp $
26 +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1695 2015/06/29 11:01:31 mrueg Exp $
27 +
28 + 29 Jun 2015; Manuel RĂ¼ger <mrueg@g.o> ruby-ng.eclass:
29 + Quote RUBY_S and sub_S as the directory could contain spaces.
30
31 29 Jun 2015; Davide Pesavento <pesa@g.o> qmake-utils.eclass:
32 Introduce qt{4,5}_get_plugindir(). Rephrase some eclass doc.
33
34
35
36 1.58 eclass/ruby-ng.eclass
37
38 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ruby-ng.eclass?rev=1.58&view=markup
39 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ruby-ng.eclass?rev=1.58&content-type=text/plain
40 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ruby-ng.eclass?r1=1.57&r2=1.58
41
42 Index: ruby-ng.eclass
43 ===================================================================
44 RCS file: /var/cvsroot/gentoo-x86/eclass/ruby-ng.eclass,v
45 retrieving revision 1.57
46 retrieving revision 1.58
47 diff -u -r1.57 -r1.58
48 --- ruby-ng.eclass 31 May 2015 05:57:23 -0000 1.57
49 +++ ruby-ng.eclass 29 Jun 2015 11:01:31 -0000 1.58
50 @@ -1,6 +1,6 @@
51 # Copyright 1999-2015 Gentoo Foundation
52 # Distributed under the terms of the GNU General Public License v2
53 -# $Header: /var/cvsroot/gentoo-x86/eclass/ruby-ng.eclass,v 1.57 2015/05/31 05:57:23 graaff Exp $
54 +# $Header: /var/cvsroot/gentoo-x86/eclass/ruby-ng.eclass,v 1.58 2015/06/29 11:01:31 mrueg Exp $
55
56 # @ECLASS: ruby-ng.eclass
57 # @MAINTAINER:
58 @@ -302,7 +302,7 @@
59 old_S=${S}
60 case ${EAPI} in
61 4|5)
62 - if [ -z ${RUBY_S} ]; then
63 + if [ -z "${RUBY_S}" ]; then
64 sub_S=${P}
65 else
66 sub_S=${RUBY_S}
67 @@ -316,7 +316,7 @@
68 # Special case, for the always-lovely GitHub fetches. With this,
69 # we allow the star glob to just expand to whatever directory it's
70 # called.
71 - if [[ ${sub_S} = *"*"* ]]; then
72 + if [[ "${sub_S}" = *"*"* ]]; then
73 case ${EAPI} in
74 2|3)
75 #The old method of setting S depends on undefined package
76 @@ -325,7 +325,7 @@
77 ;;
78 esac
79 pushd "${WORKDIR}"/all &>/dev/null
80 - sub_S=$(eval ls -d ${sub_S} 2>/dev/null)
81 + sub_S=$(eval ls -d "${sub_S}" 2>/dev/null)
82 popd &>/dev/null
83 fi