diff options
| author | Maciej Mrozowski <reavertm@gentoo.org> | 2010-12-24 00:20:09 +0100 |
|---|---|---|
| committer | Maciej Mrozowski <reavertm@gentoo.org> | 2010-12-24 00:20:09 +0100 |
| commit | 58a16eff34fadf6cb2eebaaf9ea9344593ea0c9a (patch) | |
| tree | ca8b8e711b996eba2268e65a95d28fd5d61f1dce /eclass/kde4-meta.eclass | |
| parent | db40cc9c049b2eb561e0f77ec8d46eb8ab33ce88 (diff) | |
| parent | 5ec2739afb20c6339557a63c167265aabdefe297 (diff) | |
| download | kde-58a16eff34fadf6cb2eebaaf9ea9344593ea0c9a.tar.gz kde-58a16eff34fadf6cb2eebaaf9ea9344593ea0c9a.tar.bz2 kde-58a16eff34fadf6cb2eebaaf9ea9344593ea0c9a.zip | |
Merge branch 'master' into kde-git
Conflicts:
media-sound/amarok/Manifest
media-sound/amarok/amarok-2.3.90.ebuild
media-sound/amarok/amarok-9999.ebuild
Diffstat (limited to 'eclass/kde4-meta.eclass')
| -rw-r--r-- | eclass/kde4-meta.eclass | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass index f6e2c82201d..de920f8fc3d 100644 --- a/eclass/kde4-meta.eclass +++ b/eclass/kde4-meta.eclass @@ -252,8 +252,8 @@ kde4-meta_src_extract() { extractlist+=" $(__list_needed_subdirectories)" pushd "${WORKDIR}" > /dev/null - [[ -n ${KDE4_STRICTER} ]] && echo tar -xpf "${tarfile}" ${KMTARPARAMS} ${extractlist} >&2 - tar -xpf "${tarfile}" ${KMTARPARAMS} ${extractlist} 2> /dev/null + [[ -n ${KDE4_STRICTER} ]] && echo tar -xpf "${tarfile}" ${KMTARPARAMS} ${extractlist} + tar -xpf "${tarfile}" ${KMTARPARAMS} ${extractlist} || ewarn "tar extract command failed at least partially - continuing anyway" # Default $S is based on $P; rename the extracted directory to match $S if necessary mv ${topdir} ${P} || die "Died while moving \"${topdir}\" to \"${P}\"" |