Merge 98a87d0 into 7e56639

openSUSE · Jun 7, 2023 · b766a59 · b766a59
2 parents 7e56639 + 98a87d0
commit b766a59
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/setup-service.sh b/setup-service.sh
@@ -38,10 +38,13 @@ sudosed() {
 test -f /etc/zypp/repos.d/d_l_python.repo || \
   $SUDO zypper --non-interactive \
     addrepo https://download.opensuse.org/repositories/devel:/languages:/python/openSUSE_Tumbleweed/ d_l_python
-$SUDO zypper --non-interactive --gpg-auto-import-keys install cargo gcc gcc-c++ make openssl-devel ruby-devel \
+$SUDO zypper --non-interactive --gpg-auto-import-keys install gcc gcc-c++ make openssl-devel ruby-devel \
   python-langtable-data \
   git augeas-devel jemalloc-devel || exit 1
 
+# only install cargo if it is not available (avoid conflicts with rustup)
+test -f /usr/bin/cargo || $SUDO zypper --non-interactive install cargo
+
 # - Install service rubygem dependencies
 (
   cd $MYDIR/service