[146881] contrib/mp-buildbot

[cal at macports.org]

Revision: 146881
          https://trac.macports.org/changeset/146881
Author:   cal at macports.org
Date:     2016-03-19 04:11:06 -0700 (Sat, 19 Mar 2016)
Log Message:
-----------
mp-buildbot: Ensure errors are fatal

Modified Paths:
--------------
    contrib/mp-buildbot/mpbb-checkout
    contrib/mp-buildbot/mpbb-gather-archives
    contrib/mp-buildbot/mpbb-selfupdate

Modified: contrib/mp-buildbot/mpbb-checkout
===================================================================
--- contrib/mp-buildbot/mpbb-checkout	2016-03-19 10:55:42 UTC (rev 146880)
+++ contrib/mp-buildbot/mpbb-checkout	2016-03-19 11:11:06 UTC (rev 146881)
@@ -23,39 +23,39 @@
     if [[ -d "${tools_svn}/.svn" ]] ; then
         echo "Update macports tools from svn..."
         if [[ -e "${tools_svn}/.svn/lock" ]]; then
-            "$svn" --non-interactive cleanup "${tools_svn}"
+            "$svn" --non-interactive cleanup "${tools_svn}" || return $?
         fi
         "$svn" update --non-interactive \
             -r HEAD \
-            "${tools_svn}"
+            "${tools_svn}" || return $?
     else
         echo "Checking out macports tools from svn..."
         mkdir -p "${option_workdir}"
         "$svn" checkout --non-interactive \
             -r HEAD "${svn_url}/base/portmgr/jobs" \
-            "${tools_svn}"
+            "${tools_svn}" || return $?
     fi
 
     if [[ -d "${dports_svn}/.svn" ]] ; then
         echo "Update macports from svn..."
         # TODO: add switching of SVN server
         if [[ -e "${dports_svn}/.svn/lock" ]]; then
-            "$svn" --non-interactive cleanup "${dports_svn}"
+            "$svn" --non-interactive cleanup "${dports_svn}" || return $?
         fi
         "$svn" update --non-interactive \
             -r "${svn_rev}" \
-            "${dports_svn}"
+            "${dports_svn}" || return $?
     else
         echo "Checking out macports from svn..."
         mkdir -p "${option_workdir}"
         "$svn" checkout --non-interactive \
             -r "${svn_rev}" "${svn_url}/dports" \
-            "${dports_svn}"
+            "${dports_svn}" || return $?
     fi
 
-    (cd "${dports_svn}" && "${option_prefix}/bin/portindex")
+    (cd "${dports_svn}" && "${option_prefix}/bin/portindex") || return $?
 
-    cat > "${option_prefix}/etc/macports/sources.conf" <<EOF
+    cat || return $? > "${option_prefix}/etc/macports/sources.conf" <<EOF
 # Automatically overwritten by mpbb-checkout
 # Do not edit !!!
 #

Modified: contrib/mp-buildbot/mpbb-gather-archives
===================================================================
--- contrib/mp-buildbot/mpbb-gather-archives	2016-03-19 10:55:42 UTC (rev 146880)
+++ contrib/mp-buildbot/mpbb-gather-archives	2016-03-19 11:11:06 UTC (rev 146881)
@@ -12,7 +12,7 @@
 gather-archives() {
     curl=/usr/bin/curl
     tclsh=${option_prefix}/bin/port-tclsh
-    mkdir -p "${option_staging_dir}"
+    mkdir -p "${option_staging_dir}" || return $?
 
     archive_path=$("${option_prefix}/bin/port" -q location "${option_port}")
     archive_basename=$(basename "${archive_path}")
@@ -22,8 +22,8 @@
         # check for distributability
         if "${tclsh}" "${option_workdir}/tools/port_binary_distributable.tcl" -v "${option_port}"; then
             echo "Staging archive for upload: ${archive_basename}"
-            mkdir -p "${option_staging_dir}/${option_port}"
-            cp "${archive_path}" "${option_staging_dir}/${option_port}/${archive_basename}":w
+            mkdir -p "${option_staging_dir}/${option_port}" || return $?
+            cp "${archive_path}" "${option_staging_dir}/${option_port}/${archive_basename}" || return $?
         fi
     fi
 }

Modified: contrib/mp-buildbot/mpbb-selfupdate
===================================================================
--- contrib/mp-buildbot/mpbb-selfupdate	2016-03-19 10:55:42 UTC (rev 146880)
+++ contrib/mp-buildbot/mpbb-selfupdate	2016-03-19 11:11:06 UTC (rev 146881)
@@ -9,5 +9,5 @@
 }
 
 selfupdate() {
-    "${option_prefix}/bin/port" -d selfupdate --nosync
+    "${option_prefix}/bin/port" -d selfupdate --nosync || return $?
 }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160319/a5a971c2/attachment.html>