diff options
| author |   Arfrever Frehtes Taifersar Arahesis <arfrever.fta@gmail.com> | 2011-12-25 00:29:45 +0000 |
|---|---|---|
| committer | Arfrever Frehtes Taifersar Arahesis <arfrever.fta@gmail.com> | 2011-12-25 00:29:45 +0000 |
| commit | ae68ef966135768f6c0b2e43f81ddc5a5a89550c (patch) | |
| tree | 6a007c888fe694a315a99a725b02e36778f18040 | |
| parent | Support PYTHON_RESTRICTED_ABIS in PYTHON_ABIS check. (diff) | |
| download | python-updater-ae68ef966135768f6c0b2e43f81ddc5a5a89550c.tar.gz python-updater-ae68ef966135768f6c0b2e43f81ddc5a5a89550c.tar.bz2 python-updater-ae68ef966135768f6c0b2e43f81ddc5a5a89550c.zip | |
Fix some messages.
| -rwxr-xr-x | python-updater | 61 |
1 files changed, 32 insertions, 29 deletions
diff --git a/python-updater b/python-updater index 8520e8c..11a1070 100755 --- a/python-updater +++ b/python-updater @@ -432,11 +432,11 @@ while [[ -n "${1}" ]]; do -dmanual|--disable-manual) CHECK_MANUAL=0 ;; - -ePYTHON_ABIS|--enable-PYTHON_ABIS) - CHECK_PYTHON_ABIS=1 + -eneed_rebuild|--enable-need_rebuild) + CHECK_ECLASS_NEED_REBUILD=1 ;; - -dPYTHON_ABIS|--disable-PYTHON_ABIS) - CHECK_PYTHON_ABIS=0 + -dneed_rebuild|--disable-need_rebuild) + CHECK_ECLASS_NEED_REBUILD=0 ;; -epylibdir|--enable-pylibdir) CHECK_PYLIBDIR=1 @@ -444,6 +444,12 @@ while [[ -n "${1}" ]]; do -dpylibdir|--disable-pylibdir) CHECK_PYLIBDIR=0 ;; + -ePYTHON_ABIS|--enable-PYTHON_ABIS) + CHECK_PYTHON_ABIS=1 + ;; + -dPYTHON_ABIS|--disable-PYTHON_ABIS) + CHECK_PYTHON_ABIS=0 + ;; -eshared_linking|--enable-shared_linking) CHECK_SHARED_LINKING=1 ;; @@ -456,12 +462,6 @@ while [[ -n "${1}" ]]; do -dstatic_linking|--disable-static_linking) CHECK_STATIC_LINKING=0 ;; - -eneed_rebuild|--enable-need_rebuild) - CHECK_ECLASS_NEED_REBUILD=1 - ;; - -dneed_rebuild|--disable-need_rebuild) - CHECK_ECLASS_NEED_REBUILD=0 - ;; --) shift ADDITIONAL_OPTIONS="${*}" @@ -618,37 +618,40 @@ for repository in $(echo "${!PYTHON_GLOBALLY_SUPPORTED_ABIS[@]}" | sed -e "s/ /\ done eoutdent -if [[ CHECK_SHARED_LINKING -ne 0 ]]; then +[[ "${CHECK_MANUAL}" -ne 0 ]] \ + && veinfo 1 'Check "manual" enabled.' \ + || veinfo 1 'Check "manual" disabled.' +[[ "${CHECK_ECLASS_NEED_REBUILD}" -ne 0 ]] \ + && veinfo 1 'Check "need_rebuild" enabled.' \ + || veinfo 1 'Check "need_rebuild" disabled.' +[[ "${CHECK_PYLIBDIR}" -ne 0 ]] \ + && veinfo 1 'Check "pylibdir" enabled.' \ + || veinfo 1 'Check "pylibdir" disabled.' +[[ "${CHECK_PYTHON_ABIS}" -ne 0 ]] \ + && veinfo 1 'Check "PYTHON_ABIS" enabled.' \ + || veinfo 1 'Check "PYTHON_ABIS" disabled.' +if [[ "${CHECK_SHARED_LINKING}" -ne 0 ]]; then if ! type -P scanelf >/dev/null 2>&1; then - ewarn "scanelf not found!" - ewarn "check shared_linking is disabled." + ewarn 'scanelf not found!' + ewarn 'Check "shared_linking" is disabled.' CHECK_SHARED_LINKING=0 else - veinfo 1 'check "shared_linking" enabled.' + veinfo 1 'Check "shared_linking" enabled.' fi else - veinfo 1 'check "shared_linking" disabled.' + veinfo 1 'Check "shared_linking" disabled.' fi -if [[ CHECK_STATIC_LINKING -ne 0 ]]; then +if [[ "${CHECK_STATIC_LINKING}" -ne 0 ]]; then if ! type -P scanelf >/dev/null 2>&1; then - ewarn "scanelf not found!" - ewarn "check static_linking is disabled." + ewarn 'scanelf not found!' + ewarn 'Check "static_linking" is disabled.' CHECK_STATIC_LINKING=0 else - veinfo 1 'check "static_linking" enabled.' + veinfo 1 'Check "static_linking" enabled.' fi else - veinfo 1 'check "static_linking" disabled.' + veinfo 1 'Check "static_linking" disabled.' fi -[[ CHECK_PYLIBDIR -ne 0 ]] \ - && veinfo 1 'check "pylibdir" enabled.' \ - || veinfo 1 'check "pylibdir" disabled.' -[[ CHECK_MANUAL -ne 0 ]] \ - && veinfo 1 'check "manual" enabled.' \ - || veinfo 1 'check "manual" disabled.' -[[ CHECK_ECLASS_NEED_REBUILD -ne 0 ]] \ - && veinfo 1 'check "need_rebuild" enabled.' \ - || veinfo 1 'check "need_rebuild" disabled.' # Iterate through the contents of all the installed packages. # ${PKG_DBDIR} must be followed by '/' to avoid problems when ${PKG_DBDIR} is a symlink. |