summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2013-11-04 22:05:31 +0000
committerMike Gilbert <floppym@gentoo.org>2013-11-04 22:05:31 +0000
commit17ef976333458f0cff51d80019077df9766dfe72 (patch)
tree09cbe3a219ed9348cf500dd8e6c27a22faca4b16 /eclass
parentNew sepolgen release (diff)
downloadgentoo-2-17ef976333458f0cff51d80019077df9766dfe72.tar.gz
gentoo-2-17ef976333458f0cff51d80019077df9766dfe72.tar.bz2
gentoo-2-17ef976333458f0cff51d80019077df9766dfe72.zip
Initialize cert_opt to an empty array instead of an empty string. Reported by Kristian Fiskerstrand.
Diffstat (limited to 'eclass')
-rw-r--r--eclass/ChangeLog6
-rw-r--r--eclass/mercurial.eclass4
2 files changed, 7 insertions, 3 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index 7ce4aa2db8f3..98fcf976df85 100644
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1046 2013/11/04 21:36:36 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1047 2013/11/04 22:05:31 floppym Exp $
+
+ 04 Nov 2013; Mike Gilbert <floppym@gentoo.org> mercurial.eclass:
+ Initialize cert_opt to an empty array instead of an empty string. Reported by
+ Kristian Fiskerstrand.
04 Nov 2013; Ulrich Müller <ulm@gentoo.org> elisp-common.eclass:
Don't create site-gentoo.el in postrm phase.
diff --git a/eclass/mercurial.eclass b/eclass/mercurial.eclass
index a6afee6a47f0..51446d2c4405 100644
--- a/eclass/mercurial.eclass
+++ b/eclass/mercurial.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mercurial.eclass,v 1.22 2013/04/28 16:15:33 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mercurial.eclass,v 1.23 2013/11/04 22:05:31 floppym Exp $
# @ECLASS: mercurial.eclass
# @MAINTAINER:
@@ -85,7 +85,7 @@ mercurial_fetch() {
EHG_REPO_URI=${1-${EHG_REPO_URI}}
[[ -z "${EHG_REPO_URI}" ]] && die "EHG_REPO_URI is empty"
- local cert_opt=
+ local cert_opt=()
[[ -f ${EPREFIX}/etc/ssl/certs/ca-certificates.crt ]] && \
cert_opt=( --config "web.cacerts=${EPREFIX}/etc/ssl/certs/ca-certificates.crt" )