summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2015-01-14 22:50:02 +0000
committerMichał Górny <mgorny@gentoo.org>2015-01-14 22:50:02 +0000
commit96266fbda2830f69cf13a9ae6cb5c70d44407212 (patch)
tree956f24306875a866b7603fac0148d59d34c7132b /eclass
parentVersion bump (diff)
downloadgentoo-2-96266fbda2830f69cf13a9ae6cb5c70d44407212.tar.gz
gentoo-2-96266fbda2830f69cf13a9ae6cb5c70d44407212.tar.bz2
gentoo-2-96266fbda2830f69cf13a9ae6cb5c70d44407212.zip
prune_libtool_files: properly reset variables for following loop iterations.
Diffstat (limited to 'eclass')
-rw-r--r--eclass/ChangeLog5
-rw-r--r--eclass/eutils.eclass6
2 files changed, 7 insertions, 4 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index 28d976d9126d..97f595197a83 100644
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1510 2015/01/13 21:35:29 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1511 2015/01/14 22:50:01 mgorny Exp $
+
+ 14 Jan 2015; Michał Górny <mgorny@gentoo.org> eutils.eclass:
+ prune_libtool_files: properly reset variables for following loop iterations.
13 Jan 2015; Michał Górny <mgorny@gentoo.org> python-r1.eclass:
Deprecate python_export_best() verbosely.
diff --git a/eclass/eutils.eclass b/eclass/eutils.eclass
index 4554b050bf88..2214945b9b86 100644
--- a/eclass/eutils.eclass
+++ b/eclass/eutils.eclass
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.441 2014/12/30 07:24:52 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.442 2015/01/14 22:50:02 mgorny Exp $
# @ECLASS: eutils.eclass
# @MAINTAINER:
@@ -1578,7 +1578,7 @@ prune_libtool_files() {
fi
[[ ${f} != ${archivefile} ]] || die 'regex sanity check failed'
- local reason pkgconfig_scanned
+ local reason= pkgconfig_scanned=
local snotlink=$(sed -n -e 's:^shouldnotlink=::p' "${f}")
if [[ ${snotlink} == yes ]]; then