Fix conflicting 'six.py' #16

1 files changed, 5 insertions, 1 deletions

diff --git a/PKGBUILD b/PKGBUILD
index c7ef83c6f153..c4e8ccc62668 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -338,7 +338,7 @@ package_lldb-svn() {
         "llvm-libs-svn=${pkgver}-${pkgrel}"
         'libedit'
         'libxml2'
-        'python2'
+        'python2-six'
     )
     groups=('llvm-toolchain-svn')
     provides=('lldb')
@@ -348,6 +348,10 @@ package_lldb-svn() {
 
     make DESTDIR="${pkgdir}" install
 
+    # Clean up conflicting files
+    # TODO: This should probably be discussed with upstream.
+    rm -rf "${pkgdir}/usr/lib/python2.7/site-packages/six.py"
+
     _fix_python_exec_path \
         "${pkgdir}${_py_sitepkg_dir}/lldb/utils/symbolication.py"