diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2012-05-09 20:33:16 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2012-05-09 20:33:16 +0000 |
| commit | 9355a5afd5a6057c40627dae254ea033f87597e0 (patch) | |
| tree | 23f840dd8b6e1d49ba236c6da17ac933ba63c90e /eclass | |
| parent | Fix xorg-2's git:// EGIT_REPO_URI. (diff) | |
| download | gentoo-2-9355a5afd5a6057c40627dae254ea033f87597e0.tar.gz gentoo-2-9355a5afd5a6057c40627dae254ea033f87597e0.tar.bz2 gentoo-2-9355a5afd5a6057c40627dae254ea033f87597e0.zip | |
Update the default unpack to detect cases when oxt is packed elsewhere.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/office-ext.eclass | 10 |
2 files changed, 11 insertions, 4 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 182d2a795a91..875ca5e80196 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.247 2012/05/09 20:19:10 mattst88 Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.248 2012/05/09 20:33:16 scarabeus Exp $ + + 09 May 2012; Tomáš Chvátal <scarabeus@gentoo.org> office-ext.eclass: + Update the default unpack to detect cases when oxt is packed elsewhere. 09 May 2012; Matt Turner <mattst88@gentoo.org> xorg-2.eclass: Fix xorg-2's git:// EGIT_REPO_URI. diff --git a/eclass/office-ext.eclass b/eclass/office-ext.eclass index 153661321c9a..c4484c660a20 100644 --- a/eclass/office-ext.eclass +++ b/eclass/office-ext.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/office-ext.eclass,v 1.3 2012/05/09 16:12:16 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/office-ext.eclass,v 1.4 2012/05/09 20:33:16 scarabeus Exp $ # @ECLASS: office-ext.eclass # @AUTHOR: @@ -46,8 +46,12 @@ office-ext_src_unpack() { default for i in ${OO_EXTENSIONS[@]}; do - debug-print "${FUNCNAME}: cp -v \"${DISTDIR}/${i}\" \"${S}\"" - cp -v "${DISTDIR}/${i}" "${S}" || die + # Copy only if the oxt is present, sometimes they are in tarballs + # so we want to fail only when we do need to do the cp. + if [[ -f "${DISTDIR}/${i}" ]] ; then + debug-print "${FUNCNAME}: cp -v \"${DISTDIR}/${i}\" \"${S}\"" + cp -v "${DISTDIR}/${i}" "${S}" || die + fi done } |