Updated patches

thunder · Nov 8, 2021 · 7aa4065 · 7aa4065
1 parent 279ea55
commit 7aa4065
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/bin/test-drupal-project b/bin/test-drupal-project
@@ -70,7 +70,6 @@ for i in "${@}"; do
         ;;
     -v | --verbose)
         export DRUPAL_TESTING_VERBOSE=true
-        set -o xtrace
         ;;
     -?*)
         printf "Unknown option: %s\n" "${i}"
@@ -93,6 +92,10 @@ SCRIPT_DIR=$(get_script_dir)
 # shellcheck source=/dev/null
 source "${SCRIPT_DIR}/../configuration.sh"
 
+if [ "${DRUPAL_TESTING_VERBOSE}" = true ] ; then
+    set -o xtrace
+fi
+
 for library in "${SCRIPT_DIR}"/../lib/*.sh; do
     # shellcheck source=/dev/null
     source "${library}"

diff --git a/lib/stages/build.sh b/lib/stages/build.sh
@@ -35,11 +35,8 @@ _stage_build() {
         wget https://www.drupal.org/files/issues/2021-10-05/3240601%2B3240813-9.2.x.patch -O 3240601.patch
         patch -p1 < 3240601.patch
 
-        wget https://www.drupal.org/files/issues/2021-10-05/3192365-17-mkdir-race-condition-in-tests.patch
-        patch -p1 < 3192365-17-mkdir-race-condition-in-tests.patch
-
-        wget https://www.drupal.org/files/issues/2021-11-02/3032275-71.patch
-        patch -p1 < 3032275-71.patch
+        wget https://www.drupal.org/files/issues/2021-11-03/3032275-78.patch
+        patch -p1 < 3032275-78.patch
         cd - || exit
     fi