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

Error on list-tagged --sigs --paths without mount

Browse source 
Related: https://pagure.io/koji/issue/934
This commit is contained in:
Tomas Kopecek 2022-10-04 15:16:03 +02:00
parent 69b0bad6e5
commit 08809355fa
2 changed files with 28 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

31
cli/koji_cli/commands.py
View file

@ -2713,21 +2713,34 @@ def anon_handle_list_tagged(goptions, session, args):
if not taginfo:
parser.error("No such tag: %s" % tag)
if options.sigs and options.paths:
packages_dir = os.path.join(koji.BASEDIR, 'packages')
if not os.path.exists(packages_dir):
error("'list-tagged --sigs --paths' requires accessible %s" % packages_dir)
if options.rpms:
rpms, builds = session.listTaggedRPMS(tag, **opts)
data = rpms
if options.paths:
build_idx = dict([(b['id'], b) for b in builds])
build_idx = {}
for build in builds:
build_idx[build['id']] = build
builddir = pathinfo.build(build)
if os.path.isdir(builddir):
build['_dir'] = builddir
else:
warn('Build directory not found: %s' % builddir)
for rinfo in data:
build = build_idx[rinfo['build_id']]
builddir = pathinfo.build(build)
if options.sigs:
sigkey = rinfo['sigkey']
signedpath = os.path.join(builddir, pathinfo.signed(rinfo, sigkey))
if os.path.exists(signedpath):
rinfo['path'] = signedpath
else:
rinfo['path'] = os.path.join(builddir, pathinfo.rpm(rinfo))
builddir = build.get('_dir')
if builddir:
if options.sigs:
sigkey = rinfo['sigkey']
signedpath = os.path.join(builddir, pathinfo.signed(rinfo, sigkey))
if os.path.exists(signedpath):
rinfo['path'] = signedpath
else:
rinfo['path'] = os.path.join(builddir, pathinfo.rpm(rinfo))
fmt = "%(path)s"
data = [x for x in data if 'path' in x]
else:

8
tests/test_cli/test_list_tagged.py
View file

@ -122,9 +122,11 @@ sigkey rpmA-0.0.1-1.el6.x86_64
self.session.listTagged.assert_not_called()
self.assert_console_message(stdout, expected)
@mock.patch('os.path.isdir', return_value=True)
@mock.patch('os.path.exists', return_value=True)
@mock.patch('sys.stdout', new_callable=six.StringIO)
@mock.patch('koji.util.eventFromOpts', return_value=None)
def test_list_tagged_rpms_paths(self, event_from_opts_mock, stdout):
def test_list_tagged_rpms_paths(self, event_from_opts_mock, stdout, os_path_exists, isdir):
expected = """/mnt/koji/packages/packagename/version/1.el6/noarch/rpmA-0.0.1-1.el6.noarch.rpm
/mnt/koji/packages/packagename/version/1.el6/x86_64/rpmA-0.0.1-1.el6.x86_64.rpm
"""
@ -138,13 +140,15 @@ sigkey rpmA-0.0.1-1.el6.x86_64
self.tag, package=self.pkg, inherit=None, latest=3, arch=['x86_64'])
self.session.listTagged.assert_not_called()
@mock.patch('os.path.exists')
@mock.patch('sys.stdout', new_callable=six.StringIO)
@mock.patch('koji.util.eventFromOpts', return_value=None)
def test_list_tagged_sigs_paths(self, event_from_opts_mock, stdout):
def test_list_tagged_sigs_paths(self, event_from_opts_mock, stdout, os_path_exists):
expected = ""
args = [self.tag, self.pkg, '--latest-n=3', '--rpms', '--sigs',
'--arch=x86_64', '--paths']
os_path_exists.side_effect = [True, False, False]
anon_handle_list_tagged(self.options, self.session, args)
self.assert_console_message(stdout, expected)
self.ensure_connection_mock.assert_called_once_with(self.session, self.options)