[ros-rospack] 01/01: Remove repeated rosdep error message

[Jochen Sprickerhof]

This is an automated email from the git hooks/post-receive script.

jspricke-guest pushed a commit to branch master
in repository ros-rospack.

commit 4fb3b600499b91033a6e05e92d4f32b409d27dc2
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Mon Nov 9 14:26:54 2015 +0100

    Remove repeated rosdep error message
---
 .../patches/0003-Make-rospack-usable-without-rosdep.patch | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/debian/patches/0003-Make-rospack-usable-without-rosdep.patch b/debian/patches/0003-Make-rospack-usable-without-rosdep.patch
index 239c7a7..4caff35 100644
--- a/debian/patches/0003-Make-rospack-usable-without-rosdep.patch
+++ b/debian/patches/0003-Make-rospack-usable-without-rosdep.patch
@@ -3,15 +3,18 @@ Date: Mon, 9 Nov 2015 11:19:09 +0100
 Subject: Make rospack usable without rosdep
 
 ---
- src/rospack.cpp | 18 ++++++++++++++++--
- 1 file changed, 16 insertions(+), 2 deletions(-)
+ src/rospack.cpp | 19 ++++++++++++++++---
+ 1 file changed, 16 insertions(+), 3 deletions(-)
 
 diff --git a/src/rospack.cpp b/src/rospack.cpp
-index 1502a9e..124847a 100644
+index 1502a9e..9196b04 100644
 --- a/src/rospack.cpp
 +++ b/src/rospack.cpp
-@@ -1692,7 +1692,14 @@ Rosstackage::isSysPackage(const std::string& pkgname)
-       PyErr_Print();
+@@ -1689,10 +1689,16 @@ Rosstackage::isSysPackage(const std::string& pkgname)
+     Py_DECREF(pName);
+     if(!pModule)
+     {
+-      PyErr_Print();
        PyGILState_Release(gstate);
        std::string errmsg = "could not find python module 'rosdep2.rospack'. is rosdep up-to-date (at least 0.10.4)?";
 -      throw Exception(errmsg);
@@ -26,7 +29,7 @@ index 1502a9e..124847a 100644
      }
      pDict = PyModule_GetDict(pModule);
    }
-@@ -1738,7 +1745,14 @@ Rosstackage::isSysPackage(const std::string& pkgname)
+@@ -1738,7 +1744,14 @@ Rosstackage::isSysPackage(const std::string& pkgname)
        PyErr_Print();
        PyGILState_Release(gstate);
        std::string errmsg = "the rosdep view is empty: call 'sudo rosdep init' and 'rosdep update'";

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ros/ros-rospack.git