niklas/ros2_tracing
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove temporary workaround for python3-lttng

Browse source
This commit is contained in:
Christophe Bedard 2019-06-25 15:13:56 +02:00
parent be117ae072
commit e97a649c21
2 changed files with 8 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
docker-ci-base/Dockerfile
View file

@ -1,10 +1,14 @@
FROM ros:dashing-ros-base-bionic FROM ros:dashing-ros-base-bionic
RUN apt-get update RUN apt-get update
RUN apt-get install --no-install-recommends -y \ RUN apt-get install --no-install-recommends -y \
libasio-dev \ libasio-dev \
libtinyxml2-dev libtinyxml2-dev
RUN apt-get install -y software-properties-common
RUN apt-add-repository -y ppa:lttng/ppa
RUN apt-get update
RUN apt-get install -y \ RUN apt-get install -y \
python3-lttng \ python3-lttng \
python3-babeltrace python3-babeltrace

14
tracetools_trace/tracetools_trace/tools/lttng.py
View file

@ -14,19 +14,13 @@
"""Interface for tracing with LTTng.""" """Interface for tracing with LTTng."""
import sys
from typing import List from typing import List
# Temporary workaround import lttng
sys.path = ['/usr/local/lib/python3.6/site-packages'] + sys.path
import lttng # noqa: E402 from .names import DEFAULT_CONTEXT
from .names import DEFAULT_EVENTS_KERNEL
from .names import ( # noqa: E402 from .names import DEFAULT_EVENTS_ROS
DEFAULT_CONTEXT,
DEFAULT_EVENTS_KERNEL,
DEFAULT_EVENTS_ROS,
)
def lttng_init( def lttng_init(