From 4b642ceead2d9578c9aca154ef5b5c8607c53ad5 Mon Sep 17 00:00:00 2001
From: Dupont Paco <paco.dupont@gmail.com>
Date: Fri, 7 Apr 2017 16:37:46 +0200
Subject: [PATCH] Fix namespace to avoid duplication and node name empty #35

---
 pepper_bringup/launch/pepper_full.launch | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pepper_bringup/launch/pepper_full.launch b/pepper_bringup/launch/pepper_full.launch
index ae14c4a..9eaaebb 100644
--- a/pepper_bringup/launch/pepper_full.launch
+++ b/pepper_bringup/launch/pepper_full.launch
@@ -6,14 +6,15 @@
   <arg name="roscore_ip"          default="127.0.0.1" />
   <arg name="network_interface"   default="eth0" />
 
-  <arg name="namespace"           default="pepper_robot" />
+  <arg name="namespace"           default="$(optenv ROS_NAMESPACE pepper_robot)" />
 
   <!-- naoqi driver -->
-  <include file="$(find naoqi_driver)/launch/naoqi_driver.launch"  ns="$(arg namespace)" >
+  <include file="$(find naoqi_driver)/launch/naoqi_driver.launch">
     <arg name="nao_ip"            value="$(arg nao_ip)" />
     <arg name="nao_port"          value="$(arg nao_port)" />
     <arg name="roscore_ip"        value="$(arg roscore_ip)" />
     <arg name="network_interface" value="$(arg network_interface)" />
+    <arg name="namespace"         value="$(arg namespace)" />
   </include>
 
   <!-- launch pose manager -->