File: 0002-Handle-Debian-specific-ROS-1-ROS-2-hybrid-packages.patch

package info (click to toggle)
ros-catkin-lint 1.6.25-1
  • links: PTS, VCS
  • area: main
  • in suites: sid, trixie
  • size: 2,236 kB
  • sloc: python: 6,213; makefile: 16; sh: 2
file content (36 lines) | stat: -rw-r--r-- 1,244 bytes parent folder | download 
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
 
From: =?utf-8?q?Timo_R=C3=B6hling?= <roehling@debian.org>
Date: Sun, 2 Oct 2022 19:00:13 +0200
Subject: Handle Debian-specific ROS 1/ROS 2 hybrid packages

Forwarded: not-needed
---
 src/catkin_lint/environment.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/catkin_lint/environment.py b/src/catkin_lint/environment.py
index fbd95ff..402580e 100644
--- a/src/catkin_lint/environment.py
+++ b/src/catkin_lint/environment.py
@@ -119,6 +119,13 @@ class PackageType:
     INDETERMINATE = 32768
 
 
+KNOWN_HYBRID_PACKAGES = set([
+    "angles",
+    "class_loader",
+    "pluginlib",
+])
+
+
 class CatkinEnvironment(object):
     def __init__(self, os_env=None, use_rosdep=True, use_rosdistro=True, use_cache=True, quiet=False):
         self.package_path_order = []
@@ -156,7 +163,7 @@ class CatkinEnvironment(object):
         pkgs = find_packages(path, use_cache=self.use_cache)
         found = []
         for p, m in iteritems(pkgs):
-            if is_catkin_package(m):
+            if is_catkin_package(m) or (path == "/usr/share" and m.name in KNOWN_HYBRID_PACKAGES):
                 self.known_catkin_pkgs.add(m.name)
                 pm = (os.path.join(path, p), m)
                 found.append(pm)