Merged r3454 from trunk.
This commit is contained in:
parent
d992b48221
commit
97ad140b32
1 changed files with 4 additions and 2 deletions
|
@ -203,7 +203,8 @@ inline_doc
|
||||||
* )
|
* )
|
||||||
pkg_ver=$(grep "^${X11}[[:space:]]" ../packages | cut -f3)
|
pkg_ver=$(grep "^${X11}[[:space:]]" ../packages | cut -f3)
|
||||||
inst_ver=$(grep "^${X11}[[:space:]]" ../packages | cut -f4)
|
inst_ver=$(grep "^${X11}[[:space:]]" ../packages | cut -f4)
|
||||||
[ -n "${pkg_ver}" ] && [ "x${pkg_ver}" = "x${inst_ver}" ] && continue
|
[ -n "${pkg_ver}" ] && [[ "x${pkg_ver}" = "x${inst_ver}" ]] && continue
|
||||||
|
[ -n "${pkg_ver}" ] && [[ "x${pkg_ver}" < "x${inst_ver}" ]] && continue
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
;;
|
;;
|
||||||
|
@ -212,7 +213,8 @@ inline_doc
|
||||||
# If DEP has been previouly installed, skip it
|
# If DEP has been previouly installed, skip it
|
||||||
pkg_ver=$(grep "^${DEP}[[:space:]]" ../packages | cut -f3)
|
pkg_ver=$(grep "^${DEP}[[:space:]]" ../packages | cut -f3)
|
||||||
inst_ver=$(grep "^${DEP}[[:space:]]" ../packages | cut -f4)
|
inst_ver=$(grep "^${DEP}[[:space:]]" ../packages | cut -f4)
|
||||||
[ -n "${pkg_ver}" ] && [ "x${pkg_ver}" = "x${inst_ver}" ] && continue
|
[ -n "${pkg_ver}" ] && [[ "x${pkg_ver}" = "x${inst_ver}" ]] && continue
|
||||||
|
[ -n "${pkg_ver}" ] && [[ "x${pkg_ver}" < "x${inst_ver}" ]] && continue
|
||||||
|
|
||||||
#------------------
|
#------------------
|
||||||
# Prevent circular dependencies
|
# Prevent circular dependencies
|
||||||
|
|
Reference in a new issue