Merge ~alexsander-souza/curtin:lp2054672 into curtin:master

Proposed by Alexsander de Souza
Status: Merged
Approved by: Dan Bungert
Approved revision: 0c8623ea481f5ee743e625c51710e0ce7508d128
Merge reported by: Server Team CI bot
Merged at revision: not available
Proposed branch: ~alexsander-souza/curtin:lp2054672
Merge into: curtin:master
Diff against target: 21 lines (+2/-2)
1 file modified
curtin/block/bcache.py (+2/-2)
Reviewer Review Type Date Requested Status
Server Team CI bot continuous-integration Approve
curtin developers Pending
Review via email: mp+461160@code.launchpad.net

Commit message

raise exception on bcache validation errors

returning the exception is probably a typo

To post a comment you must log in.
Revision history for this message
Server Team CI bot (server-team-bot) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/curtin/block/bcache.py b/curtin/block/bcache.py
2index c1a8d26..f92c29b 100644
3--- a/curtin/block/bcache.py
4+++ b/curtin/block/bcache.py
5@@ -369,14 +369,14 @@ def validate_bcache_ready(bcache_device, bcache_sys_path):
6 raise OSError(msg)
7 else:
8 msg = 'didnt find "dev" attribute on: %s', bcache_dev
9- return OSError(msg)
10+ raise OSError(msg)
11
12 else:
13 LOG.debug("Failed to validate bcache device '%s' from sys_path"
14 " '%s'", bcache_device, bcache_sys_path)
15 msg = ('sysfs path %s does not appear to be a bcache device' %
16 bcache_sys_path)
17- return ValueError(msg)
18+ raise ValueError(msg)
19
20
21 def ensure_bcache_is_registered(bcache_device, expected, retry=None):

Subscribers

People subscribed via source and target branches