Skip to content

Commit

Permalink
Remove hyphen between package and version in log messages
Browse files Browse the repository at this point in the history
  • Loading branch information
bennuttall committed Jul 25, 2021
1 parent ae01cae commit 12dd2a1
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
10 changes: 5 additions & 5 deletions piwheels/master/mr_chase.py
Original file line number Diff line number Diff line change
Expand Up @@ -146,9 +146,9 @@ def do_import(self, state):
self.logger.error('invalid ABI: %s', state.abi_tag)
return 'ERROR', 'invalid ABI: %s' % state.abi_tag
if not self.db.test_package_version(state.package, state.version):
self.logger.error('unknown package version %s-%s',
self.logger.error('unknown package version %s %s',
state.package, state.version)
return 'ERROR', 'unknown package version %s-%s' % (
return 'ERROR', 'unknown package version %s %s' % (
state.package, state.version)
try:
self.db.log_build(state)
Expand Down Expand Up @@ -232,11 +232,11 @@ def do_remove_package(self, package, reason):

def do_remove_version(self, package, version, reason):
if not self.db.test_package_version(package, version):
self.logger.error('unknown package version %s-%s',
self.logger.error('unknown package version %s %s',
package, version)
return 'ERROR', 'unknown package version %s-%s' % (
return 'ERROR', 'unknown package version %s %s' % (
package, version)
self.logger.info('removing %s-%s', package, version)
self.logger.info('removing %s %s', package, version)
if reason:
self.db.skip_package_version(package, version, reason)
self.web_queue.send_msg('DELVER', [package, version])
Expand Down
4 changes: 2 additions & 2 deletions tests/master/test_mr_chase.py
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ def test_import_unknown_pkg(db_queue, task, import_queue, build_state):
db_queue.send('OK', False)
task.poll(0)
assert import_queue.recv_msg() == (
'ERROR', 'unknown package version %s-%s' % (bs.package, bs.version))
'ERROR', 'unknown package version %s %s' % (bs.package, bs.version))
assert task.logger.error.call_count == 1
assert len(task.states) == 0

Expand Down Expand Up @@ -440,7 +440,7 @@ def test_remove_unknown_ver(db_queue, task, import_queue, build_state):
db_queue.send('OK', False)
task.poll(0)
assert import_queue.recv_msg() == (
'ERROR', 'unknown package version %s-%s' % (bs.package, bs.version))
'ERROR', 'unknown package version %s %s' % (bs.package, bs.version))
assert task.logger.error.call_count == 1
assert len(task.states) == 0

Expand Down

0 comments on commit 12dd2a1

Please sign in to comment.