From d01aa42b94b93a3cb2f30c6df4e13afe4a457518 Mon Sep 17 00:00:00 2001 From: Mike McLean Date: Oct 02 2019 14:59:10 +0000 Subject: hub plugins: use joinpath instead of os.path.join --- diff --git a/plugins/hub/rpm2maven.py b/plugins/hub/rpm2maven.py index 717df54..5cedce9 100644 --- a/plugins/hub/rpm2maven.py +++ b/plugins/hub/rpm2maven.py @@ -9,6 +9,7 @@ from __future__ import absolute_import import koji from koji.context import context from koji.plugin import callback +from koji.util import joinpath from koji.util import rmtree import six.moves.configparser import fnmatch @@ -41,7 +42,7 @@ def maven_import(cbtype, *args, **kws): else: return - tmpdir = os.path.join(koji.pathinfo.work(), 'rpm2maven', koji.buildLabel(buildinfo)) + tmpdir = joinpath(koji.pathinfo.work(), 'rpm2maven', koji.buildLabel(buildinfo)) try: if os.path.exists(tmpdir): rmtree(tmpdir) @@ -86,10 +87,10 @@ def scan_and_import(buildinfo, rpminfo, tmpdir): if len(poms) != 1: continue - pom_info = koji.parse_pom(os.path.join(dirpath, poms[0])) + pom_info = koji.parse_pom(joinpath(dirpath, poms[0])) maven_info = koji.pom_to_maven_info(pom_info) maven_archives.append({'maven_info': maven_info, - 'files': [os.path.join(dirpath, f) for f in filenames]}) + 'files': [joinpath(dirpath, f) for f in filenames]}) if not maven_archives: return