Magellan Linux

  • Back to homepage
    • /[magellan-source]/branches/mage-next/src/smage2.in

    Diff of /branches/mage-next/src/smage2.in

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

    revision 2863 by niro, Tue Sep 2 13:55:19 2014 UTC revision 2864 by niro, Fri Feb 13 09:58:19 2015 UTC
    # Line 404  then Line 404  then
    404   # automatically set !pkgbuild here too   # automatically set !pkgbuild here too
    405   msetfeature "!pkgbuild"   msetfeature "!pkgbuild"
    406  else  else
    407   ( run_resume pkg_setup || pkg_setup ) | ${SMAGE_LOG_CMD}   ( run_resume pkg_setup || pkg_setup ) |& ${SMAGE_LOG_CMD}
    408   die_pipestatus 0 "pkg_setup failed"   die_pipestatus 0 "pkg_setup failed"
    409   resume_stamp pkg_setup   resume_stamp pkg_setup
    410   step_by_step pkg_setup   step_by_step pkg_setup
    411    
    412   ( run_resume src_prepare || src_prepare ) | ${SMAGE_LOG_CMD}   ( run_resume src_prepare || src_prepare ) |& ${SMAGE_LOG_CMD}
    413   die_pipestatus 0 "src_prepare failed"   die_pipestatus 0 "src_prepare failed"
    414   resume_stamp src_prepare   resume_stamp src_prepare
    415   step_by_step src_prepare   step_by_step src_prepare
    416    
    417   ( run_resume src_compile || src_compile ) | ${SMAGE_LOG_CMD}   ( run_resume src_compile || src_compile ) |& ${SMAGE_LOG_CMD}
    418   die_pipestatus 0 "src_compile failed"   die_pipestatus 0 "src_compile failed"
    419   resume_stamp src_compile   resume_stamp src_compile
    420   step_by_step src_compile   step_by_step src_compile
    # Line 422  else Line 422  else
    422   # only run checks if requested   # only run checks if requested
    423   if mqueryfeature "!check"   if mqueryfeature "!check"
    424   then   then
    425   echo "!check detected; src_check() will not be run!" | ${SMAGE_LOG_CMD}   echo "!check detected; src_check() will not be run!" |& ${SMAGE_LOG_CMD}
    426   else   else
    427   ( run_resume src_check || src_check ) | ${SMAGE_LOG_CMD}   ( run_resume src_check || src_check ) |& ${SMAGE_LOG_CMD}
    428   die_pipestatus 0 "src_check failed"   die_pipestatus 0 "src_check failed"
    429   resume_stamp src_check   resume_stamp src_check
    430   fi   fi
    # Line 465  else Line 465  else
    465   echo -en " for subpkg: ${COLBLUE}${PNAME}${COLDEFAULT}"   echo -en " for subpkg: ${COLBLUE}${PNAME}${COLDEFAULT}"
    466   echo -e " - basepkg: ${COLBLUE}${SPLIT_PACKAGE_BASE}${COLDEFAULT} ..."   echo -e " - basepkg: ${COLBLUE}${SPLIT_PACKAGE_BASE}${COLDEFAULT} ..."
    467    
    468   ( run_resume src_install_${subpackage} || src_install_${subpackage} ) | ${SMAGE_LOG_CMD}   ( run_resume src_install_${subpackage} || src_install_${subpackage} ) |& ${SMAGE_LOG_CMD}
    469   die_pipestatus 0 "src_install_${subpackage} failed"   die_pipestatus 0 "src_install_${subpackage} failed"
    470   resume_stamp src_install_${subpackage}   resume_stamp src_install_${subpackage}
    471   step_by_step src_install_${subpackage}   step_by_step src_install_${subpackage}
    # Line 477  else Line 477  else
    477   # unset all saved smage variables   # unset all saved smage variables
    478   split_unset_variables   split_unset_variables
    479   else   else
    480   ( run_resume src_install || src_install ) | ${SMAGE_LOG_CMD}   ( run_resume src_install || src_install ) |& ${SMAGE_LOG_CMD}
    481   die_pipestatus 0 "src_install failed"   die_pipestatus 0 "src_install failed"
    482   resume_stamp src_install   resume_stamp src_install
    483   step_by_step src_install   step_by_step src_install
    Legend:
    Removed from v.2863  
    changed lines
      Added in v.2864