Merged r3458 from trunk.
This commit is contained in:
parent
373f062d01
commit
e75665c046
1 changed files with 5 additions and 5 deletions
|
@ -51,7 +51,7 @@ do
|
||||||
continue
|
continue
|
||||||
fi
|
fi
|
||||||
# Do not include installed packages newer than the book ones
|
# Do not include installed packages newer than the book ones
|
||||||
if [ -n "${PKG_VER}" ] && [[ "x${PKG_VER}" = "x${INST_VER}" ]]; then
|
if [ -n "${PKG_VER}" ] && [[ "x${PKG_VER}" < "x${INST_VER}" ]]; then
|
||||||
continue
|
continue
|
||||||
fi
|
fi
|
||||||
# Set installed version for updated meta-packages
|
# Set installed version for updated meta-packages
|
||||||
|
@ -83,9 +83,9 @@ EOF
|
||||||
continue
|
continue
|
||||||
fi
|
fi
|
||||||
# Do not include installed packages newer than the book ones
|
# Do not include installed packages newer than the book ones
|
||||||
if [ -n "${PKG_VER}" ] && [[ "x${PKG_VER}" = "x${INST_VER}" ]]; then
|
if [ -n "${PKG_VER}" ] && [[ "x${PKG_VER}" < "x${INST_VER}" ]]; then
|
||||||
continue
|
continue
|
||||||
fi
|
fi
|
||||||
# Set installed version for updated meta-packages components
|
# Set installed version for updated meta-packages components
|
||||||
[ -n "${INST_VER}" ] && INST_STRING="[installed ${INST_VER}]"
|
[ -n "${INST_VER}" ] && INST_STRING="[installed ${INST_VER}]"
|
||||||
(
|
(
|
||||||
|
@ -126,7 +126,7 @@ EOF
|
||||||
continue
|
continue
|
||||||
fi
|
fi
|
||||||
# Do not include installed packages newer than the book ones
|
# Do not include installed packages newer than the book ones
|
||||||
if [ -n "${PKG_VER}" ] && [[ "x${PKG_VER}" = "x${INST_VER}" ]]; then
|
if [ -n "${PKG_VER}" ] && [[ "x${PKG_VER}" < "x${INST_VER}" ]]; then
|
||||||
continue
|
continue
|
||||||
fi
|
fi
|
||||||
# Set installed version for updated packages
|
# Set installed version for updated packages
|
||||||
|
|
Reference in a new issue