summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rwxr-xr-xpython-updater24
2 files changed, 4 insertions, 24 deletions
diff --git a/ChangeLog b/ChangeLog
index 5191f6b..9043ce4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ This file lists all changes except typo and formatting fixes.
2010-01-29 Arfrever Frehtes Taifersar Arahesis
+ * python-updater: Delete eclass check, which causes many false positives,
+ relies on deprecated PYVER variable and is incompatible with packages, which
+ set active version of Python.
+
* python-updater: Properly handle packages not supporting installation for multiple
Python versions and calling python_set_active_version().
diff --git a/python-updater b/python-updater
index a172dc5..d4bd86b 100755
--- a/python-updater
+++ b/python-updater
@@ -48,7 +48,6 @@ CUSTOM_PMS_COMMAND=""
ADDITIONAL_OPTIONS=""
# Checks
-CHECK_ECLASS=0
CHECK_MANUAL=1
CHECK_PYLIBDIR=1
CHECK_PYTHON_ABIS=1
@@ -97,7 +96,6 @@ done)
package manager.
-eCHECK --enable-CHECK
Enable CHECK where CHECK can be one of:
- * eclass (Disabled by default)
* pylibdir (Enabled by default)
* PYTHON_ABIS (Enabled by default)
* shared_linking (Enabled by default)
@@ -305,12 +303,6 @@ while [[ -n "${1}" ]]; do
shift
PIPE_COMMAND="${1}"
;;
- -eeclass|--enable-eclass)
- CHECK_ECLASS=1
- ;;
- -declass|--disable-eclass)
- CHECK_ECLASS=0
- ;;
-emanual|--enable-manual)
CHECK_MANUAL=1
;;
@@ -455,9 +447,6 @@ fi
[[ CHECK_PYLIBDIR -ne 0 ]] \
&& veinfo 1 'check "pylibdir" enabled.' \
|| veinfo 1 'check "pylibdir" disabled.'
-[[ CHECK_ECLASS -ne 0 ]] \
- && veinfo 1 'check "eclass" enabled.' \
- || veinfo 1 'check "eclass" disabled.'
[[ CHECK_MANUAL -ne 0 ]] \
&& veinfo 1 'check "manual" enabled.' \
|| veinfo 1 'check "manual" disabled.'
@@ -643,19 +632,6 @@ for content in $(find ${PKG_DBDIR}/ -name CONTENTS | sort); do
eoutdent && eoutdent
fi
fi
-
- if [[ CHECK_ECLASS -ne 0 ]]; then
- get_vdb_variable PYVER "${environment_file}"
- if echo "${PYVER}" | grep -qE "$(get_OLD_PYTHON_VERSIONS_REGEX)"; then
- PKGS_TO_REMERGE+=" ${CATPKGVER}"
- eindent
- einfo "Adding to list: ${CATPKGVER}"
- eindent
- veinfo 1 "check: eclass [ Ebuild set PYVER=${PYVER} ]"
- eoutdent && eoutdent
- continue
- fi
- fi
done
# Pipe to command if we have one