From 9043b816d47e4b88255f8aee8980832766f99283 Mon Sep 17 00:00:00 2001 From: Chris Evich Date: Tue, 9 Jul 2019 12:06:51 -0400 Subject: Cirrus: Fix missing removal of packaged podman This was originally intended, but somehow omitted from #1936 Signed-off-by: Chris Evich --- contrib/cirrus/setup_environment.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'contrib/cirrus/setup_environment.sh') diff --git a/contrib/cirrus/setup_environment.sh b/contrib/cirrus/setup_environment.sh index f312e593a..e49bb98fe 100755 --- a/contrib/cirrus/setup_environment.sh +++ b/contrib/cirrus/setup_environment.sh @@ -52,7 +52,9 @@ install_test_configs make install.tools case "$SPECIALMODE" in - none) ;; # Do the normal thing + none) + remove_packaged_podman_files # we're building from source + ;; rootless) # Only do this once, even if ROOTLESS_USER (somehow) changes if ! grep -q 'ROOTLESS_USER' /etc/environment @@ -65,9 +67,9 @@ case "$SPECIALMODE" in tee -a /etc/environment) && eval "$X" && echo "$X" setup_rootless fi + remove_packaged_podman_files ;; in_podman) # Assumed to be Fedora - dnf install -y podman $SCRIPT_BASE/setup_container_environment.sh ;; windows) ;& # for podman-remote building only -- cgit v1.2.3-54-g00ecf