particle-os/debian-koji
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

hub plugins: use joinpath instead of os.path.join

Browse source
This commit is contained in:
Mike McLean 2019-09-23 21:03:06 -04:00
parent c49660be33
commit e5b36d8f21
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
plugins/hub/rpm2maven.py
View file

@ -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