[arvados] updated: 2.6.0-504-g3cd66295f

[git repository hosting]

Summary of changes:
 tools/salt-install/provision.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

       via  3cd66295fa65172a9e9aba4c203b89e26b5c9776 (commit)
      from  00ff9cf6b638f78df82fb5e15ca6788c8d095f40 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 3cd66295fa65172a9e9aba4c203b89e26b5c9776
Author: Lucas Di Pentima <lucas.dipentima at curii.com>
Date:   Tue Aug 15 10:53:05 2023 -0300

    Fixes deployment when using envvar BRANCH=main. No issue #
    
    Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas.dipentima at curii.com>

diff --git a/tools/salt-install/provision.sh b/tools/salt-install/provision.sh
index 3aa94aa58..6e5bdf249 100755
--- a/tools/salt-install/provision.sh
+++ b/tools/salt-install/provision.sh
@@ -450,7 +450,7 @@ echo "...arvados"
 test -d arvados || git clone --quiet https://git.arvados.org/arvados-formula.git ${F_DIR}/arvados
 
 # If we want to try a specific branch of the formula
-if [ "x${BRANCH:-}" != "x" ]; then
+if [ "x${BRANCH:-}" != "xmain" ]; then
   ( cd ${F_DIR}/arvados && git checkout --quiet -t origin/"${BRANCH}" -b "${BRANCH}" )
 elif [ "x${ARVADOS_TAG:-}" != "x" ]; then
   ( cd ${F_DIR}/arvados && git checkout --quiet tags/"${ARVADOS_TAG}" -b "${ARVADOS_TAG}" )

-----------------------------------------------------------------------


hooks/post-receive
--