--- trunk/pkgtools/add2alx-060 2013/05/13 11:44:18 2114 +++ trunk/pkgtools/add2alx-060 2013/05/13 11:45:19 2115 @@ -74,10 +74,32 @@ INSTALLDB_BUILDROOT=$(get_value_from_file INSTALLDB ${BUILDROOT}/etc/mage.rc) CURSPLITPACKAGES="$(get_value_from_file SPLIT_PACKAGES ${SMAGEFILE})" -if [[ -d ${BUILDROOT}/${INSTALLDB_BUILDROOT}/${CURPCATEGORIE}/${CURPNAME}-${CURPVER}-${CURPBUILD} ]] +# abort if the package is already installed in BUILDROOT +if [[ -z ${CURSPLITPACKAGES} ]] then - echo "Package '${CURPCATEGORIE}/${CURPNAME}-${CURPVER}-${CURPBUILD}' already installed in ${BUILDROOT}. Aborting!" - exit 1 + if [[ -d ${BUILDROOT}/${INSTALLDB_BUILDROOT}/${CURPCATEGORIE}/${CURPNAME}-${CURPVER}-${CURPBUILD} ]] + then + echo "Package '${CURPCATEGORIE}/${CURPNAME}-${CURPVER}-${CURPBUILD}' already installed in ${BUILDROOT}. Aborting!" + exit 1 + fi +else + for i in ${CURSPLITPACKAGES} + do + if [[ -d ${BUILDROOT}/${INSTALLDB_BUILDROOT}/${CURPCATEGORIE}/${i}-${CURPVER}-${CURPBUILD} ]] + then + SPLITINSTALLED+=" ${CURPCATEGORIE}/${i}-${CURPVER}-${CURPBUILD}" + fi + done + if [[ ! -z ${SPLITINSTALLED} ]] + then + echo "Following SPLIT-Packages are installled from ${CURPCATEGORIE}/${CURPNAME}-${CURPVER}-${CURPBUILD} in ${BUILDROOT}:" + for i in ${SPLITINSTALLED} + do + echo " ${i}" + done + echo "Aborted." + exit 1 + fi fi # delete md5 if exist @@ -113,6 +135,8 @@ :> ${BUILDROOT}/.installrc echo "export LC_ALL=C" >> ${BUILDROOT}/.installrc +# do not start any services, set mage bootstrap flag +echo "export MAGE_BOOTSTRAP=true" >> ${BUILDROOT}/.installrc echo "REPO=${REPO}" >> ${BUILDROOT}/.installrc echo "CURPNAME=${CURPNAME}" >> ${BUILDROOT}/.installrc echo "CURPVER=${CURPVER}" >> ${BUILDROOT}/.installrc @@ -160,7 +184,7 @@ echo 'rm -rf /var/cache/mage/sources/${CURPNAME}' >> ${BUILDROOT}/.installrc EOF -sudo -H /sbin/chroot ${BUILDROOT} /bin/bash /.installrc +sudo -H chroot ${BUILDROOT} /bin/bash /.installrc sudo rm ${BUILDROOT}/.installrc if [[ ! -z ${CURSPLITPACKAGES} ]]