Merge "Offline deployment fails on jumphost with docker installed" into stable/colorado

1 files changed, 8 insertions, 0 deletions

diff --git a/deploy/prepare.sh b/deploy/prepare.sh
index 97771b87..ea1534ff 100755
--- a/deploy/prepare.sh
+++ b/deploy/prepare.sh
@@ -114,6 +114,10 @@ function _pre_env_setup()
      cd $WORK_DIR/prepare/jh_env_package
      tar -zxvf trusty-jh-ppa.tar.gz
 
+     if [[ ! -z /etc/apt/sources.list.d ]]; then
+          mv /etc/apt/sources.list.d /etc/apt/sources.list.d.bak
+     fi
+
      if [[ -f /etc/apt/apt.conf ]]; then
           mv /etc/apt/apt.conf /etc/apt/apt.conf.bak
      fi
@@ -158,6 +162,10 @@ EOF
      if [[ -f /etc/apt/apt.conf.bak ]]; then
           mv /etc/apt/apt.conf.bak /etc/apt/apt.conf
      fi
+
+     if [[ ! -z /etc/apt/sources.list.d.bak ]]; then
+          mv /etc/apt/sources.list.d.bak /etc/apt/sources.list.d
+     fi
 }
 
 function _pre_pip_setup()