| 1 |
commit: 7a8a30fe9acc1a8e1b5cad04edb1094b9164f667 |
| 2 |
Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jul 9 03:43:20 2016 +0000 |
| 4 |
Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jul 9 03:44:14 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a8a30fe |
| 7 |
|
| 8 |
mozlinguas-v2.eclass: minor corrections related to L10N migration |
| 9 |
|
| 10 |
Some of the L10N-migrated code did not work properly when generating |
| 11 |
langpacks as part of the build process. This commit fixes those issues. |
| 12 |
|
| 13 |
eclass/mozlinguas-v2.eclass | 6 +++--- |
| 14 |
1 file changed, 3 insertions(+), 3 deletions(-) |
| 15 |
|
| 16 |
diff --git a/eclass/mozlinguas-v2.eclass b/eclass/mozlinguas-v2.eclass |
| 17 |
index 4facb58..215141c 100644 |
| 18 |
--- a/eclass/mozlinguas-v2.eclass |
| 19 |
+++ b/eclass/mozlinguas-v2.eclass |
| 20 |
@@ -175,7 +175,7 @@ else |
| 21 |
if [[ -n ${MOZ_L10N_URI_PREFIX} ]]; then |
| 22 |
SRC_URI+=" l10n_${xflag/[_@]/-}? ( ${MOZ_L10N_URI_PREFIX}${x}${MOZ_L10N_URI_SUFFIX} )" |
| 23 |
fi |
| 24 |
- IUSE+=" l10n_${x/[_@]/-}" |
| 25 |
+ IUSE+=" l10n_${xflag/[_@]/-}" |
| 26 |
done |
| 27 |
fi |
| 28 |
unset x xflag |
| 29 |
@@ -348,9 +348,9 @@ mozlinguas_xpistage_langpacks() { |
| 30 |
mozlinguas_src_install() { |
| 31 |
local x |
| 32 |
mozlinguas_export |
| 33 |
- if [[ -n ${MOZ_GENERATE_LANGPACKS} ]]; then |
| 34 |
+ if [[ -n ${MOZ_GENERATE_LANGPACKS} ]] && [[ -n ${mozlinguas[*]} ]]; then |
| 35 |
local repopath="${WORKDIR}/${PN}-generated-langpacks" |
| 36 |
- mkdir -p "${repopath}" |
| 37 |
+ mkdir -p "${repopath}" || die |
| 38 |
pushd "${BUILD_OBJ_DIR:-.}"/dist/*/xpi > /dev/null || die |
| 39 |
for x in "${mozlinguas[@]}"; do |
| 40 |
cp "${MOZ_P}.${x}.langpack.xpi" \ |
Archives