[nst-cvs] include/nightly nightly-build.bash,1.22,1.23

[Paul B. <pbl...@us...>]

Update of /cvsroot/nst/include/nightly
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv25403/include/nightly

Modified Files:
	nightly-build.bash 
Log Message:
Adding code to try a second pass at "yum update" with the
--skip-broken option if the first attempt fails.



Index: nightly-build.bash
===================================================================
RCS file: /cvsroot/nst/include/nightly/nightly-build.bash,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** nightly-build.bash	20 Sep 2009 21:36:08 -0000	1.22
--- nightly-build.bash	28 Sep 2009 18:54:20 -0000	1.23
***************
*** 377,381 ****
    time_mark "Running \"yum -y update\"" yum_update_start;
  
!   local RC=1;
    if [ "${TEST_MODE}" == "true" ]; then
      RC=0;
--- 377,381 ----
    time_mark "Running \"yum -y update\"" yum_update_start;
  
!   declare -i RC=1;
    if [ "${TEST_MODE}" == "true" ]; then
      RC=0;
***************
*** 387,392 ****
    fi
  
!   time_mark "Ran \"yum -y update\"" yum_update_end yum_update_start ${RC};
  
    local p;
    for p in firefox kernel; do
--- 387,402 ----
    fi
  
!   time_mark "Ran \"yum -y update\"" yum_update_end yum_update_start ${RC} "true";
! 
!   # If first attempt failed, try running with --skip-broken enabled
!   if (( RC != 0 )); then
!     ISSUE_CNT=ISSUE_CNT+1;
!     time_mark "Running \"yum -y --skip-broken update\"" yum_update2_start;
!     yum -y --skip-broken update 2>&1 | tee ${YUMLOG};
!     RC=${PIPESTATUS[0]};
!     time_mark "Ran \"yum -y --skip-broken update\"" yum_update2_end yum_update2_start ${RC};
!   fi
  
+   # Check to see if any dependency related packages were updated
    local p;
    for p in firefox kernel; do