Fixup CMake and local directory cleanup

locusrobotics · Dec 1, 2017 · 21bd7dc · 21bd7dc
1 parent 60437fa
commit 21bd7dc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/catkin_virtualenv/cmake/build_venv.py b/catkin_virtualenv/cmake/build_venv.py
@@ -81,8 +81,9 @@ def delete_bytecode(directory):
     # Remove all .py[co] files since they embed absolute paths
     delete_bytecode(deploy.package_dir)
 
-    if not args.python3:
+    local_dir = os.path.join(deploy.package_dir, 'local')
+    if os.path.exists(local_dir):
         # Remove local folder
-        shutil.rmtree(os.path.join(deploy.package_dir, 'local'))
+        shutil.rmtree(local_dir)
 
     sys.exit(0)
diff --git a/catkin_virtualenv/cmake/catkin_generate_virtualenv.cmake b/catkin_virtualenv/cmake/catkin_generate_virtualenv.cmake
@@ -104,6 +104,6 @@ function(catkin_generate_virtualenv)
     # <https://github.com/ros/catkin/blob/kinetic-devel/cmake/test/nosetests.cmake#L86>
     message(STATUS "Using virtualenv to run Python nosetests: ${nosetests}")
     set(NOSETESTS ${nosetests} PARENT_SCOPE)
-    endif()
+  endif()
 
 endfunction()