Magellan Linux

  • Back to homepage
    • /[magellan-source]/trunk/mage/usr/lib/mage/smage2.sh

    Diff of /trunk/mage/usr/lib/mage/smage2.sh

    Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

    revision 950 by niro, Sat Nov 21 01:44:27 2009 UTC revision 951 by niro, Sat Nov 21 14:31:50 2009 UTC
    # Line 844  regen_mage_tree() Line 844  regen_mage_tree()
    844   export PNAME="${i}"   export PNAME="${i}"
    845   split_info_${i}   split_info_${i}
    846   build_mage_script --split-pkg-base "${split_pkg_base}"   build_mage_script --split-pkg-base "${split_pkg_base}"
    847     # restore smage environment
    848     split_restore_variables
    849   done   done
    850   echo   echo
    851   # restore smage environment   # unset all saved smage variables
    852   split_restore_variables   split_unset_variables
    853    
    854   else   else
    855   echo   echo
    # Line 1000  split_restore_variables() Line 1002  split_restore_variables()
    1002   eval "${saved_postremove/SAVED_/}"   eval "${saved_postremove/SAVED_/}"
    1003   export -f postremove   export -f postremove
    1004   fi   fi
    1005    }
    1006    
    1007    split_unset_variables()
    1008    {
    1009   # unset saved vars; not needed anymore   # unset saved vars; not needed anymore
    1010   unset SAVED_PNAME   unset SAVED_PNAME
    1011   unset SAVED_PVER   unset SAVED_PVER
    # Line 1304  then Line 1309  then
    1309   --pver "${PVER}" \   --pver "${PVER}" \
    1310   --pbuild "${PBUILD}" \   --pbuild "${PBUILD}" \
    1311   --parch "${ARCH}"   --parch "${ARCH}"
    1312     # restore smage environment
    1313     split_restore_variables
    1314   done   done
    1315   split_restore_variables   # unset all saved smage variables
    1316     split_unset_variables
    1317    
    1318   else   else
    1319   # build md5sum for existing packages   # build md5sum for existing packages
    # Line 1496  then Line 1504  then
    1504   done   done
    1505   # restore bindir & pname   # restore bindir & pname
    1506   split_restore_variables   split_restore_variables
    1507     # unset all saved smage variables
    1508     split_unset_variables
    1509  else  else
    1510   src_install | ${SMAGE_LOG_CMD}   src_install | ${SMAGE_LOG_CMD}
    1511   die_pipestatus 0 "src_install failed"   die_pipestatus 0 "src_install failed"
    # Line 1607  case ${NOPKGBUILD} in Line 1617  case ${NOPKGBUILD} in
    1617   --parch "${ARCH}"   --parch "${ARCH}"
    1618    
    1619   echo -e "${COLGREEN}\nPackage ${PNAME}-${PVER}-${ARCH}-${PBUILD} successfully builded.\n${COLDEFAULT}"   echo -e "${COLGREEN}\nPackage ${PNAME}-${PVER}-${ARCH}-${PBUILD} successfully builded.\n${COLDEFAULT}"
    1620    
    1621     # restore smage environment
    1622     split_restore_variables
    1623   done   done
    1624   split_restore_variables   # unset all saved smage variables
    1625     split_unset_variables
    1626    
    1627   else   else
    1628   ${MLIBDIR}/pkgbuild_dir.sh ${PKGNAME} ${BINDIR} || die "package-build failed"   ${MLIBDIR}/pkgbuild_dir.sh ${PKGNAME} ${BINDIR} || die "package-build failed"
    Legend:
    Removed from v.950  
    changed lines
      Added in v.951