From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-891192-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id E57901382FE
for <garchives@archives.gentoo.org>; Sat, 9 Jul 2016 03:44:25 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id C02E8E0BCB;
Sat, 9 Jul 2016 03:44:24 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 5120EE0BCB
for <gentoo-commits@lists.gentoo.org>; Sat, 9 Jul 2016 03:44:24 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id EA34A340FCA
for <gentoo-commits@lists.gentoo.org>; Sat, 9 Jul 2016 03:44:22 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 61536CEF
for <gentoo-commits@lists.gentoo.org>; Sat, 9 Jul 2016 03:44:19 +0000 (UTC)
From: "Ian Stakenvicius" <axs@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Ian Stakenvicius" <axs@gentoo.org>
Message-ID: <1468035854.7a8a30fe9acc1a8e1b5cad04edb1094b9164f667.axs@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
X-VCS-Repository: repo/gentoo
X-VCS-Files: eclass/mozlinguas-v2.eclass
X-VCS-Directories: eclass/
X-VCS-Committer: axs
X-VCS-Committer-Name: Ian Stakenvicius
X-VCS-Revision: 7a8a30fe9acc1a8e1b5cad04edb1094b9164f667
X-VCS-Branch: master
Date: Sat, 9 Jul 2016 03:44:19 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 5a06519d-3843-4c03-906b-6f115243f745
X-Archives-Hash: ef17fc443b4257352246b5f08ebcc480
commit: 7a8a30fe9acc1a8e1b5cad04edb1094b9164f667
Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 9 03:43:20 2016 +0000
Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Sat Jul 9 03:44:14 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a8a30fe
mozlinguas-v2.eclass: minor corrections related to L10N migration
Some of the L10N-migrated code did not work properly when generating
langpacks as part of the build process. This commit fixes those issues.
eclass/mozlinguas-v2.eclass | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/eclass/mozlinguas-v2.eclass b/eclass/mozlinguas-v2.eclass
index 4facb58..215141c 100644
--- a/eclass/mozlinguas-v2.eclass
+++ b/eclass/mozlinguas-v2.eclass
@@ -175,7 +175,7 @@ else
if [[ -n ${MOZ_L10N_URI_PREFIX} ]]; then
SRC_URI+=" l10n_${xflag/[_@]/-}? ( ${MOZ_L10N_URI_PREFIX}${x}${MOZ_L10N_URI_SUFFIX} )"
fi
- IUSE+=" l10n_${x/[_@]/-}"
+ IUSE+=" l10n_${xflag/[_@]/-}"
done
fi
unset x xflag
@@ -348,9 +348,9 @@ mozlinguas_xpistage_langpacks() {
mozlinguas_src_install() {
local x
mozlinguas_export
- if [[ -n ${MOZ_GENERATE_LANGPACKS} ]]; then
+ if [[ -n ${MOZ_GENERATE_LANGPACKS} ]] && [[ -n ${mozlinguas[*]} ]]; then
local repopath="${WORKDIR}/${PN}-generated-langpacks"
- mkdir -p "${repopath}"
+ mkdir -p "${repopath}" || die
pushd "${BUILD_OBJ_DIR:-.}"/dist/*/xpi > /dev/null || die
for x in "${mozlinguas[@]}"; do
cp "${MOZ_P}.${x}.langpack.xpi" \