From 8e037381402d4cb73af4055776a240a7c11d00d8 Mon Sep 17 00:00:00 2001
From: rallytime <nicole@saltstack.com>
Date: Tue, 19 Jun 2018 11:44:44 -0400
Subject: [PATCH] Add python 3 support for Ubuntu 18

Stable installs work fine, but git installs need an additional package
to be installed (python3-setuptools). Otherwise, the script fails with
the following error:

```
*  INFO: Running install_ubuntu_git()
Traceback (most recent call last):
  File "setup.py", line 24, in <module>
    import distutils.dist
ModuleNotFoundError: No module named 'distutils.dist'
```
---
 README.rst        | 1 +
 bootstrap-salt.sh | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/README.rst b/README.rst
index 4d43092..1491cb2 100644
--- a/README.rst
+++ b/README.rst
@@ -333,6 +333,7 @@ this offering, while limited, is as follows:
 - CentOS 7
 - Debian 9
 - Ubuntu 16.04
+- Ubuntu 18.04
 
 Installing the Python 3 packages for Salt is done via the ``-x`` option:
 
diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 2e0789e..27d77b5 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -2774,6 +2774,8 @@ install_ubuntu_git_deps() {
 
         if [ -n "$_PY_EXE" ] && [ "$_PY_MAJOR_VERSION" -eq 3 ]; then
             PY_PKG_VER=3
+
+            __PACKAGES="${__PACKAGES} python3-setuptools"
         else
             PY_PKG_VER=""