[arrow] branch master updated: ARROW-2028: [Python] extra_cmake_args needs to be passed through shlex.split

[uw...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

uwe pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git


The following commit(s) were added to refs/heads/master by this push:
     new e50b1b3  ARROW-2028: [Python] extra_cmake_args needs to be passed through shlex.split
e50b1b3 is described below

commit e50b1b3263007f20d9d0e29ace7c15685e334296
Author: Korn, Uwe <Uw...@blue-yonder.com>
AuthorDate: Sun Jan 28 17:31:52 2018 +0100

    ARROW-2028: [Python] extra_cmake_args needs to be passed through shlex.split
    
    Author: Korn, Uwe <Uw...@blue-yonder.com>
    
    Closes #1501 from xhochy/ARROW-2028 and squashes the following commits:
    
    212f365 [Korn, Uwe] ARROW-2028: [Python] extra_cmake_args needs to be passed through shlex.split
---
 python/setup.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/python/setup.py b/python/setup.py
index 3d3831d..076d7e4 100644
--- a/python/setup.py
+++ b/python/setup.py
@@ -21,6 +21,7 @@ import glob
 import os
 import os.path as osp
 import re
+import shlex
 import shutil
 import sys
 
@@ -180,8 +181,9 @@ class build_ext(_build_ext):
         cmake_options.append('-DCMAKE_BUILD_TYPE={0}'
                              .format(self.build_type.lower()))
 
+        extra_cmake_args = shlex.split(self.extra_cmake_args)
         if sys.platform != 'win32':
-            cmake_command = (['cmake', self.extra_cmake_args] +
+            cmake_command = (['cmake'] + extra_cmake_args +
                              cmake_options + [source])
 
             print("-- Runnning cmake for pyarrow")
@@ -197,13 +199,11 @@ class build_ext(_build_ext):
             self.spawn(args)
             print("-- Finished cmake --build for pyarrow")
         else:
-            import shlex
             cmake_generator = 'Visual Studio 14 2015 Win64'
             if not is_64_bit:
                 raise RuntimeError('Not supported on 32-bit Windows')
 
             # Generate the build files
-            extra_cmake_args = shlex.split(self.extra_cmake_args)
             cmake_command = (['cmake'] + extra_cmake_args +
                              cmake_options +
                              [source, '-G', cmake_generator])

-- 
To stop receiving notification emails like this one, please contact
uwe@apache.org.