From b926d5a443d4432852396144d708afc362f4aac0 Mon Sep 17 00:00:00 2001 From: Guilherme Affonso Date: Tue, 2 Apr 2019 15:46:13 +0900 Subject: [PATCH] Avoid name clashing in ros msg packages --- roseus/euslisp/roseus.l | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/roseus/euslisp/roseus.l b/roseus/euslisp/roseus.l index 0bc1a46bb..54dc672bd 100644 --- a/roseus/euslisp/roseus.l +++ b/roseus/euslisp/roseus.l @@ -199,7 +199,7 @@ (exit 1)) (ros::ros-debug "Loading ~A" dir) (unless (find-package (string-upcase pkg)) - (make-package (string-upcase pkg))) + (make-package (string-upcase pkg) :use nil)) (dolist (file (directory dir)) (when (and (string= (pathname-type file) "l") (not (= #\. (elt (pathname-name file) 0)))) @@ -406,9 +406,9 @@ always the rank of list is 2" (ros::ros-error "Could not find ~A~%try rosrun roseus generate-all-msg-srv.sh ~A" manifest pkg))))) (defun ros::load-ros-package (pkg) - "load reqruied roseus files for given package" + "load required roseus files for given package" (unless (find-package (string-upcase pkg)) - (make-package (string-upcase pkg))) + (make-package (string-upcase pkg) :use nil)) (when (probe-file (format nil "~A/msg" (ros::find-load-msg-path pkg))) (ros::roseus-add-msgs pkg)) (when (probe-file (format nil "~A/srv" (ros::find-load-msg-path pkg)))