summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAli Polatel <hawking@gentoo.org>2008-08-25 09:41:57 +0000
committerAli Polatel <hawking@gentoo.org>2008-08-25 09:41:57 +0000
commit79bdbf06832853e9c556190b81ae3ab15fffd8b5 (patch)
treed50e00af6dd14b5224b35405303ee1df8f6b71be
parentUse != instead of -ne (diff)
downloadpython-updater-79bdbf06832853e9c556190b81ae3ab15fffd8b5.tar.gz
python-updater-79bdbf06832853e9c556190b81ae3ab15fffd8b5.tar.bz2
python-updater-79bdbf06832853e9c556190b81ae3ab15fffd8b5.zip
Fail
-rwxr-xr-xpython-updater19
1 files changed, 10 insertions, 9 deletions
diff --git a/python-updater b/python-updater
index 3b80fb4..3bf3813 100755
--- a/python-updater
+++ b/python-updater
@@ -273,7 +273,7 @@ PORTAGE_PYTHON="$(get_portage_python ${OLD_PY_VER} ${NEW_PY_VER})"
einfo "Starting Python Updater from ${OLD_PY_VER} to ${NEW_PY_VER} :"
-if [[ CHECK_SONAME != 0 ]]; then
+if [[ CHECK_SONAME -ne 0 ]]; then
if ! type -P scanelf >/dev/null 2>&1; then
ewarn "scanelf not found!"
ewarn "check soname is disabled."
@@ -290,13 +290,13 @@ if [[ CHECK_SONAME != 0 ]]; then
else
veinfo 1 'check "soname" disabled.'
fi
-[[ CHECK_PYLIBDIR != 0 ]] \
+[[ CHECK_PYLIBDIR -ne 0 ]] \
&& veinfo 1 'check "pylibdir" enabled.' \
|| veinfo 1 'check "pylibdir" disabled.'
-[[ CHECK_ECLASS != 0 ]] \
+[[ CHECK_ECLASS -ne 0 ]] \
&& veinfo 1 'check "eclass" enabled.' \
|| veinfo 1 'check "eclass" disabled.'
-[[ CHECK_MANUAL != 0 ]] \
+[[ CHECK_MANUAL -ne 0 ]] \
&& veinfo 1 'check "manual" enabled.' \
|| veinfo 1 'check "manual" disabled.'
@@ -320,7 +320,7 @@ for content in `find ${PKG_DBDIR} -name CONTENTS`; do
[[ ${exception} == 1 ]] && continue
# Check if package is in PKGS_MANUAL
- if [[ CHECK_MANUAL != 0 ]]; then
+ if [[ CHECK_MANUAL -ne 0 ]]; then
for pkg in ${PKGS_MANUAL}; do
if [ -z "${CATPKG##${pkg}}" ]; then
exception=2
@@ -331,7 +331,7 @@ for content in `find ${PKG_DBDIR} -name CONTENTS`; do
# replace version number by SLOT if IGNORE_VERSIONS != 0
# Don't ignore versions when SLOT doesn't exist, bug 201848
- if [[ IGNORE_VERSIONS != 0 && -f "${content/CONTENTS/SLOT}" ]]; then
+ if [[ IGNORE_VERSIONS -ne 0 && -f "${content/CONTENTS/SLOT}" ]]; then
SLOT=$(< ${content/CONTENTS/SLOT})
CATPKGVER="${CATPKG}:${SLOT}"
else
@@ -348,7 +348,7 @@ for content in `find ${PKG_DBDIR} -name CONTENTS`; do
continue
fi
- if [[ CHECK_PYLIBDIR != 0 ]]; then
+ if [[ CHECK_PYLIBDIR -ne 0 ]]; then
# Search for possible old python dirs in CONTENTS
# /usr/include/python$old
# /usr/lib/python$old
@@ -365,7 +365,7 @@ for content in `find ${PKG_DBDIR} -name CONTENTS`; do
fi
fi
- if [[ CHECK_SONAME != 0 ]]; then
+ if [[ CHECK_SONAME -ne 0 ]]; then
broken_libs="$(scanelf -qBN ${OLD_SONAME} < <(
grep -e '^obj' ${content} | cut -d' ' -f2))"
if [[ -n "${broken_libs}" ]]; then
@@ -380,7 +380,7 @@ for content in `find ${PKG_DBDIR} -name CONTENTS`; do
fi
fi
- if [[ CHECK_ECLASS != 0 ]]; then
+ if [[ CHECK_ECLASS -ne 0 ]]; then
ENVIRON="${content/CONTENTS/environment.bz2}"
if bzip2 -dc ${ENVIRON} | grep -qe "^\(export \)\?PYVER=${OLD_PY_VER}"; then
PKGS_TO_REMERGE="${PKGS_TO_REMERGE} ${CATPKGVER}"
@@ -409,3 +409,4 @@ if [[ -n "${PKGS_TO_REMERGE}" ]]; then
else
einfo "No packages needs to be remerged."
fi
+