diff options
| author |   Jeremy Huddleston <eradicator@gentoo.org> | 2005-02-07 23:20:26 +0000 |
|---|---|---|
| committer | Jeremy Huddleston <eradicator@gentoo.org> | 2005-02-07 23:20:26 +0000 |
| commit | 1744d61c0d24dbfc0ddfd5bcbc09c49aba8fadf6 (patch) | |
| tree | e1b5bb039aaf19391dcc6e8b1bcd7eb994fa1d7a | |
| parent | Removing the additional RELEASE in KV_FULL when using _rc/_pre ebuilds which ... (diff) | |
| download | gentoo-2-1744d61c0d24dbfc0ddfd5bcbc09c49aba8fadf6.tar.gz gentoo-2-1744d61c0d24dbfc0ddfd5bcbc09c49aba8fadf6.tar.bz2 gentoo-2-1744d61c0d24dbfc0ddfd5bcbc09c49aba8fadf6.zip | |
Multilib releated cleanup.
(Portage version: 2.0.51-r15)
| -rw-r--r-- | dev-lang/python/ChangeLog | 4 | ||||
| -rw-r--r-- | dev-lang/python/files/python-updater | 16 |
2 files changed, 11 insertions, 9 deletions
diff --git a/dev-lang/python/ChangeLog b/dev-lang/python/ChangeLog index 12be6680e394..2828b7ce1705 100644 --- a/dev-lang/python/ChangeLog +++ b/dev-lang/python/ChangeLog @@ -1,11 +1,11 @@ # ChangeLog for dev-lang/python # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.127 2005/02/07 20:47:42 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.128 2005/02/07 23:20:26 eradicator Exp $ *python-2.4-r2 (07 Feb 2005) 07 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org> - +files/python-2.4-libdir.patch, +python-2.4-r2.ebuild: + +files/python-2.4-libdir.patch, files/python-updater, +python-2.4-r2.ebuild: Multilib releated cleanup. *python-2.2.3-r6 (06 Feb 2005) diff --git a/dev-lang/python/files/python-updater b/dev-lang/python/files/python-updater index 12a381782b2c..ca6ef7d4364e 100644 --- a/dev-lang/python/files/python-updater +++ b/dev-lang/python/files/python-updater @@ -166,11 +166,11 @@ done # /usr/lib/python${OLD_PY_VER} # # -OLD_MODULES_DIR=/usr/lib/python${OLD_PY_VER} +OLD_MODULES_DIRS="/usr/lib/python${OLD_PY_VER} /usr/lib32/python${OLD_PY_VER} /usr/lib64/python${OLD_PY_VER}" OLD_INCLUDE_DIR=/usr/include/python${OLD_PY_VER} eloginfo "Starting Python Updater from ${OLD_PY_VER} to ${NEW_PY_VER} :" -eloginfo "Searching for packages with files in ${OLD_MODULES_DIR} .." +eloginfo "Searching for packages with files in ${OLD_MODULES_DIRS} .." # iterate thru all the installed package's contents for content in `find ${PKG_DBDIR} -name CONTENTS`; do @@ -190,12 +190,14 @@ for content in `find ${PKG_DBDIR} -name CONTENTS`; do continue; fi - if fgrep "${OLD_MODULES_DIR}" ${content} > /dev/null; then - PKGS_TO_REMERGE="${PKGS_TO_REMERGE} ${CATPKGVER}" - elogecho "Adding to list: ${CATPKGVER}" + for OLD_MODULES_DIR in ${OLD_MODULES_DIRS}; do + if fgrep "${OLD_MODULES_DIR}" ${content} > /dev/null; then + PKGS_TO_REMERGE="${PKGS_TO_REMERGE} ${CATPKGVER}" + elogecho "Adding to list: ${CATPKGVER}" elif fgrep "${OLD_INCLUDE_DIR}" ${content} > /dev/null; then - PKGS_TO_REMERGE="${PKGS_TO_REMERGE} ${CATPKGVER}" - fi + PKGS_TO_REMERGE="${PKGS_TO_REMERGE} ${CATPKGVER}" + fi + done done # now we have to do each emerge seperately because if an installed version |