From d84df6034522c1bcbc56fc5faff29dc548d58402 Mon Sep 17 00:00:00 2001
From: Markos Chandras <mchandras@suse.de>
Date: Thu, 20 Oct 2016 18:53:30 +0100
Subject: [PATCH] elements: pip-and-virtualenv: Add python-xml dependency

SUSE packages the 'xml' python module as a separate package so make
sure it's pulled in before we attempt to install the pip module
since the latter depends on it. Fixes the following problem when
building with the opensuse-minimal and pip-and-virtualenv elements:

Traceback (most recent call last):
  File "/tmp/get-pip.py", line 19177, in <module>
    main()
  File "/tmp/get-pip.py", line 194, in main
    bootstrap(tmpdir=tmpdir)
  File "/tmp/get-pip.py", line 82, in bootstrap
    import pip
  File "/tmp/tmpOiESjX/pip.zip/pip/__init__.py", line 16, in <module>
  File "/tmp/tmpOiESjX/pip.zip/pip/vcs/subversion.py", line 9, in <module>
  File "/tmp/tmpOiESjX/pip.zip/pip/index.py", line 32, in <module>
  File "/tmp/tmpOiESjX/pip.zip/pip/_vendor/html5lib/__init__.py", line 16, in <module>
  File "/tmp/tmpOiESjX/pip.zip/pip/_vendor/html5lib/html5parser.py", line 6, in <module>
  File "/tmp/tmpOiESjX/pip.zip/pip/_vendor/html5lib/inputstream.py", line 10, in <module>
  File "/tmp/tmpOiESjX/pip.zip/pip/_vendor/html5lib/utils.py", line 10, in <module>
ImportError: No module named xml.etree.ElementTree

Change-Id: I1bec12dfcde05fb07f41bcec994148c3eacbb287
---
 elements/pip-and-virtualenv/package-installs.yaml | 4 ++++
 elements/pip-and-virtualenv/pkg-map               | 6 ++++++
 2 files changed, 10 insertions(+)

diff --git a/elements/pip-and-virtualenv/package-installs.yaml b/elements/pip-and-virtualenv/package-installs.yaml
index 85c7f0ebc..6d38d1605 100644
--- a/elements/pip-and-virtualenv/package-installs.yaml
+++ b/elements/pip-and-virtualenv/package-installs.yaml
@@ -1,3 +1,7 @@
+# This package is only valid for SUSE and we need to pull it in
+# early enough because pip depends on it.
+python-xml:
+  phase: pre-install.d
 python-pip:
   installtype: package
 python-virtualenv:
diff --git a/elements/pip-and-virtualenv/pkg-map b/elements/pip-and-virtualenv/pkg-map
index 668d95174..508fd004a 100644
--- a/elements/pip-and-virtualenv/pkg-map
+++ b/elements/pip-and-virtualenv/pkg-map
@@ -3,6 +3,12 @@
     "gentoo": {
       "python-pip": "dev-python/pip",
       "python-virtualenv": "dev-python/virtualenv"
+    },
+    "suse" : {
+      "python-xml": "python-xml"
     }
+  },
+  "default": {
+    "python-xml": ""
   }
 }