Skip to content

Commit c57a0bc

Browse files
committed
Fixup: Remove moveit/__init__.py during .deb build
Fix install path recognition (6671aed). Debian install process targets: /tmp/binarydeb/ros-noetic-moveit-task-constructor-core-<version>/debian/ros-noetic-moveit-task-constructor-core/opt/ros/noetic/lib/python3/dist-packages/moveit
1 parent 75e4260 commit c57a0bc

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

core/setup.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,9 @@
1414
# Remove moveit/__init__.py when building .deb packages
1515
# Otherwise, the installation procedure will complain about conflicting files (with moveit_core)
1616
try:
17-
libdir = dist.command_obj[
18-
"install_lib"
19-
].install_dir # installation dir (.../lib/python3/dist-packages)
20-
if libdir.startswith("/opt/ros"):
17+
# installation dir (.../lib/python3/dist-packages)
18+
libdir = dist.command_obj["install_lib"].install_dir
19+
if "/debian/ros-" in libdir and "moveit-task-constructor-core/opt/ros/" in libdir:
2120
import os
2221
import shutil
2322

0 commit comments

Comments
 (0)