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 2862 by niro, Tue Sep 2 13:53:08 2014 UTC revision 2863 by niro, Fri Feb 13 09:56:25 2015 UTC
    # Line 367  then Line 367  then
    367   # automatically set !pkgbuild here too   # automatically set !pkgbuild here too
    368   msetfeature "!pkgbuild"   msetfeature "!pkgbuild"
    369  else  else
    370   ( run_resume pkg_setup || pkg_setup ) | ${SMAGE_LOG_CMD}   ( run_resume pkg_setup || pkg_setup ) |& ${SMAGE_LOG_CMD}
    371   die_pipestatus 0 "pkg_setup failed"   die_pipestatus 0 "pkg_setup failed"
    372   resume_stamp pkg_setup   resume_stamp pkg_setup
    373   step_by_step pkg_setup   step_by_step pkg_setup
    374    
    375   ( run_resume src_prepare || src_prepare ) | ${SMAGE_LOG_CMD}   ( run_resume src_prepare || src_prepare ) |& ${SMAGE_LOG_CMD}
    376   die_pipestatus 0 "src_prepare failed"   die_pipestatus 0 "src_prepare failed"
    377   resume_stamp src_prepare   resume_stamp src_prepare
    378   step_by_step src_prepare   step_by_step src_prepare
    379    
    380   ( run_resume src_compile || src_compile ) | ${SMAGE_LOG_CMD}   ( run_resume src_compile || src_compile ) |& ${SMAGE_LOG_CMD}
    381   die_pipestatus 0 "src_compile failed"   die_pipestatus 0 "src_compile failed"
    382   resume_stamp src_compile   resume_stamp src_compile
    383   step_by_step src_compile   step_by_step src_compile
    # Line 385  else Line 385  else
    385   # only run checks if requested   # only run checks if requested
    386   if mqueryfeature "!check"   if mqueryfeature "!check"
    387   then   then
    388   echo "!check detected; src_check() will not be run!" | ${SMAGE_LOG_CMD}   echo "!check detected; src_check() will not be run!" |& ${SMAGE_LOG_CMD}
    389   else   else
    390   ( run_resume src_check || src_check ) | ${SMAGE_LOG_CMD}   ( run_resume src_check || src_check ) |& ${SMAGE_LOG_CMD}
    391   die_pipestatus 0 "src_check failed"   die_pipestatus 0 "src_check failed"
    392   resume_stamp src_check   resume_stamp src_check
    393   fi   fi
    # Line 428  else Line 428  else
    428   echo -en " for subpkg: ${COLBLUE}${PNAME}${COLDEFAULT}"   echo -en " for subpkg: ${COLBLUE}${PNAME}${COLDEFAULT}"
    429   echo -e " - basepkg: ${COLBLUE}${SPLIT_PACKAGE_BASE}${COLDEFAULT} ..."   echo -e " - basepkg: ${COLBLUE}${SPLIT_PACKAGE_BASE}${COLDEFAULT} ..."
    430    
    431   ( run_resume src_install_${subpackage} || src_install_${subpackage} ) | ${SMAGE_LOG_CMD}   ( run_resume src_install_${subpackage} || src_install_${subpackage} ) |& ${SMAGE_LOG_CMD}
    432   die_pipestatus 0 "src_install_${subpackage} failed"   die_pipestatus 0 "src_install_${subpackage} failed"
    433   resume_stamp src_install_${subpackage}   resume_stamp src_install_${subpackage}
    434   step_by_step src_install_${subpackage}   step_by_step src_install_${subpackage}
    # Line 440  else Line 440  else
    440   # unset all saved smage variables   # unset all saved smage variables
    441   split_unset_variables   split_unset_variables
    442   else   else
    443   ( run_resume src_install || src_install ) | ${SMAGE_LOG_CMD}   ( run_resume src_install || src_install ) |& ${SMAGE_LOG_CMD}
    444   die_pipestatus 0 "src_install failed"   die_pipestatus 0 "src_install failed"
    445   resume_stamp src_install   resume_stamp src_install
    446   step_by_step src_install   step_by_step src_install
    Legend:
    Removed from v.2862  
    changed lines
      Added in v.2863