Fix checking file existence in DartResourceRetriever (#1107)

dartsim · Sep 3, 2018 · 4fdbfbb · 4fdbfbb
1 parent 392732c
commit 4fdbfbb
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 ## DART 6
 
+### [DART 6.6.2 (2018-09-03)](https://github.com/dartsim/dart/milestone/47?closed=1)
+
+* Utils
+
+  * Fixed checking file existence in DartResourceRetriever: [#1107](https://github.com/dartsim/dart/pull/1107)
+
 ### [DART 6.6.1 (2018-08-04)](https://github.com/dartsim/dart/milestone/46?closed=1)
 
 * Utils

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -56,7 +56,7 @@ endif()
 # If you change the version, please update the <version> tag in package.xml.
 set(DART_MAJOR_VERSION "6")
 set(DART_MINOR_VERSION "6")
-set(DART_PATCH_VERSION "1")
+set(DART_PATCH_VERSION "2")
 set(DART_VERSION "${DART_MAJOR_VERSION}.${DART_MINOR_VERSION}.${DART_PATCH_VERSION}")
 set(DART_PKG_DESC "Dynamic Animation and Robotics Toolkit.")
 set(DART_PKG_EXTERNAL_DEPS "eigen, ccd, fcl, assimp, boost")

diff --git a/dart/utils/DartResourceRetriever.cpp b/dart/utils/DartResourceRetriever.cpp
@@ -143,15 +143,13 @@ std::string DartResourceRetriever::getFilePath(const common::Uri& uri)
 
       // path is empty if the file specified by fileUri doesn't exist.
       if (!path.empty())
-      {
-        dtwarn << "Failed to retrieve a resource from '" << uri.toString()
-               << "'. Please make sure you set the environment variable for "
-               << "DART data path. For example:\n"
-               << "  $ export DART_DATA_PATH=/usr/local/share/doc/dart/data/\n";
-
         return path;
-      }
     }
+
+    dtwarn << "Failed to retrieve a resource from '" << uri.toString()
+             << "'. Please make sure you set the environment variable for "
+             << "DART data path. For example:\n"
+             << "  $ export DART_DATA_PATH=/usr/local/share/doc/dart/data/\n";
   }
   else
   {

diff --git a/package.xml b/package.xml
@@ -4,7 +4,7 @@
        a Catkin workspace. Catkin is not required to build DART. For more
        information, see: http://ros.org/reps/rep-0136.html -->
   <name>dartsim</name>
-  <version>6.6.1</version>
+  <version>6.6.2</version>
   <description>
     DART (Dynamic Animation and Robotics Toolkit) is a collaborative,
     cross-platform, open source library created by the Georgia Tech Graphics