From 78130574a38db3a79f7c669a62bf3b372db39967 Mon Sep 17 00:00:00 2001 From: TSC21 Date: Sun, 27 Jan 2019 13:01:22 +0000 Subject: [PATCH] uorb_rtps_classifier: add the capability to receive absolute and relative paths --- msg/tools/uorb_rtps_classifier.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/msg/tools/uorb_rtps_classifier.py b/msg/tools/uorb_rtps_classifier.py index 6f8216ef5f..2576474ec1 100644 --- a/msg/tools/uorb_rtps_classifier.py +++ b/msg/tools/uorb_rtps_classifier.py @@ -123,14 +123,13 @@ if __name__ == "__main__": # Parse arguments args = parser.parse_args() - msg_folder = args.msgdir + msg_dir = args.msgdir if args.msgdir == 'msg': - msg_folder = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) - if args.yaml_file != 'tools/uorb_rtps_message_ids.yaml': - classifier = Classifier(os.path.abspath(args.yaml_file), msg_folder) + msg_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) else: - classifier = Classifier(os.path.join( - msg_folder, args.yaml_file), msg_folder) + msg_dir = os.path.abspath(args.msgdir) + classifier = (Classifier(os.path.abspath(args.yaml_file), msg_dir) if os.path.isabs(args.yaml_file) \ + else Classifier(os.path.join(msg_dir, args.yaml_file), msg_dir)) if args.send: if args.path: