From 9ef56239f878613b0417c55ec16d915bcdfb035e Mon Sep 17 00:00:00 2001
From: Michael Hudson-Doyle <michael.hudson@canonical.com>
Date: Wed, 13 Jun 2018 12:55:58 +1200
Subject: [PATCH] fix snap build

 * use a different way to avoid depending on i18n in tox
 * add __init__.py files to new packages
---
 console_conf/cmd/__init__.py | 1 +
 setup.py                     | 2 +-
 subiquity/cmd/__init__.py    | 1 +
 tox.ini                      | 1 +
 4 files changed, 4 insertions(+), 1 deletion(-)
 create mode 100644 console_conf/cmd/__init__.py
 create mode 100644 subiquity/cmd/__init__.py

diff --git a/console_conf/cmd/__init__.py b/console_conf/cmd/__init__.py
new file mode 100644
index 00000000..792d6005
--- /dev/null
+++ b/console_conf/cmd/__init__.py
@@ -0,0 +1 @@
+#
diff --git a/setup.py b/setup.py
index 2e0854b7..9637fc64 100644
--- a/setup.py
+++ b/setup.py
@@ -29,7 +29,7 @@ import sys
 
 setup_kwargs = {}
 # dpkg build uses build and install, tox uses sdist
-if sys.argv[1] in ("build", "install"):
+if 'SUBIQUITY_NO_I18N' not in os.environ:
     from DistUtilsExtra.command import build_extra
     from DistUtilsExtra.command import build_i18n
     setup_kwargs['cmdclass'] = {'build': build_extra.build_extra,
diff --git a/subiquity/cmd/__init__.py b/subiquity/cmd/__init__.py
new file mode 100644
index 00000000..792d6005
--- /dev/null
+++ b/subiquity/cmd/__init__.py
@@ -0,0 +1 @@
+#
diff --git a/tox.ini b/tox.ini
index 04f2725f..faa846fc 100644
--- a/tox.ini
+++ b/tox.ini
@@ -7,6 +7,7 @@ recreate = True
 [testenv]
 basepython = python3
 setenv =
+    SUBIQUITY_NO_I18N = 1
     FAKE_TRANSLATE = always
     PYTHONPATH = {toxinidir}/fake_deps