Changeset 24701

Timestamp:

04/08/20 09:45:48 (5 years ago)

Author:

jdquinn

Message:

CHG: Ship binaries to ISSM Web site (temporary fix so we do not have to recompile and test)

File:

• issm/trunk-jpl/packagers/linux/package-issm-linux-binaries-with_dakota.sh (modified) (3 diffs)

issm/trunk-jpl/packagers/linux/package-issm-linux-binaries-with_dakota.sh

@@ -117 +117 @@
 if [[ ${numPythonTestsFailed} -ne 0 ]]; then
         echo "One or more Python tests FAILED"
-        exit 1;
+        exit 1
 else
         echo "All Python tests PASSED"
@@ -156 +156 @@
 # scp ${TARBALL} ross.ics.uci.edu:/var/www/html/${TARBALL}
 
+<<<<<<< .mine
+if [ $? -ne 0 ]; then
+        echo "The upload failed."
+        echo "Perhaps the SSH Agent was started by some other means."
+        echo "Try killing the agent and running again."
+        exit 1
+fi
+||||||| .r24698
+if [ $? -ne 0 ]; then
+        echo "The upload failed."
+        echo "Perhaps the SSH Agent was started by some other means."
+        echo "Try killing the agent and running again."
+fi
+=======
 # if [ $? -ne 0 ]; then
 #       echo "The upload failed."
@@ -161 +175 @@
 #       echo "Try killing the agent and running again."
 # fi
+>>>>>>> .r24699