diff options
| author | Maciej Mrozowski (reavertm) <reavertm@poczta.fm> | 2009-04-08 02:37:24 +0200 |
|---|---|---|
| committer | Maciej Mrozowski (reavertm) <reavertm@poczta.fm> | 2009-04-08 02:37:24 +0200 |
| commit | b6148f8838154f3b3dfc4905295f0caaf9a5f7c4 (patch) | |
| tree | 0211e6d2445159c1876e842e23a7e5668736a3a2 /eclass/kde4-functions.eclass | |
| parent | ea163156b93830af0bf3a26e89d0d079baea62b5 (diff) | |
| download | kde-b6148f8838154f3b3dfc4905295f0caaf9a5f7c4.tar.gz kde-b6148f8838154f3b3dfc4905295f0caaf9a5f7c4.tar.bz2 kde-b6148f8838154f3b3dfc4905295f0caaf9a5f7c4.zip | |
Fixed previous commit
Diffstat (limited to 'eclass/kde4-functions.eclass')
| -rw-r--r-- | eclass/kde4-functions.eclass | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/eclass/kde4-functions.eclass b/eclass/kde4-functions.eclass index 91fa71ed160..b0e1a03f2ce 100644 --- a/eclass/kde4-functions.eclass +++ b/eclass/kde4-functions.eclass @@ -188,21 +188,23 @@ migrate_store_dir() { rmdir "${cleandir}" || die "Could not move obsolete KDE store dir. Please move '${cleandir}' contents to appropriate location (possibly ${ESVN_STORE_DIR}) and manually remove '${cleandir}' in order to continue." fi - case ${KMNAME} in - extragear*|playground*) - local svnlocalpath="${ESVN_STORE_DIR}"/"${KMNAME}"/"${PN}" - if [[ -d "${svnlocalpath}" ]]; then - local destdir="${ESVN_STORE_DIR}"/"${ESVN_PROJECT}"/"`basename "${ESVN_REPO_URI}"`" - ewarn "'${svnlocalpath}' has been found." - ewarn "Moving contents to new location: ${destdir}" - addwrite "${ESVN_STORE_DIR}" - mkdir -p "${ESVN_STORE_DIR}"/"${ESVN_PROJECT}" && mv -f "${svnlocalpath}" "${destdir}" \ - || die "Failed to move to '${svnlocalpath}'" - # Try cleaning empty directories - rmdir "`dirname "${svnlocalpath}"`" 2> /dev/null - fi - ;; - esac + if ! hasq kde4-meta ${INHERITED}; then + case ${KMNAME} in + extragear*|playground*) + local svnlocalpath="${ESVN_STORE_DIR}"/"${KMNAME}"/"${PN}" + if [[ -d "${svnlocalpath}" ]]; then + local destdir="${ESVN_STORE_DIR}"/"${ESVN_PROJECT}"/"`basename "${ESVN_REPO_URI}"`" + ewarn "'${svnlocalpath}' has been found." + ewarn "Moving contents to new location: ${destdir}" + addwrite "${ESVN_STORE_DIR}" + mkdir -p "${ESVN_STORE_DIR}"/"${ESVN_PROJECT}" && mv -f "${svnlocalpath}" "${destdir}" \ + || die "Failed to move to '${svnlocalpath}'" + # Try cleaning empty directories + rmdir "`dirname "${svnlocalpath}"`" 2> /dev/null + fi + ;; + esac + fi } # Functions handling KMLOADLIBS and KMSAVELIBS |