install: Move apt-get update into setup-apt-repo.

This commit is contained in:
Tim Abbott 2016-10-16 00:56:58 -07:00
parent cf6feac65f
commit fc20c86d8d
3 changed files with 4 additions and 2 deletions

View File

@ -15,9 +15,9 @@ DEPLOYMENT_TYPE="${DEPLOYMENT_TYPE:-voyager}"
PUPPET_CLASSES="${PUPPET_CLASSES:-zulip::voyager}"
VIRTUALENV_NEEDED="${VIRTUALENV_NEEDED:-yes}"
# setup-apt-repo does an `apt-get update`
/root/zulip/scripts/lib/setup-apt-repo
apt-get update
apt-get -y dist-upgrade $APT_OPTIONS
apt-get install -y puppet git python python-six crudini $ADDITIONAL_PACKAGES

View File

@ -20,3 +20,5 @@ else
echo "Unsupported release $release."
exit 1
fi
apt-get update

View File

@ -123,8 +123,8 @@ def main():
# project.
os.chdir(ZULIP_PATH)
# setup-apt-repo does an `apt-get update`
run(["sudo", "./scripts/lib/setup-apt-repo"])
run(["sudo", "apt-get", "update"])
run(["sudo", "apt-get", "-y", "install", "--no-install-recommends"] + APT_DEPENDENCIES[codename])
if TRAVIS: