Merge ~smoser/cloud-init:bug/ds-identify-fix-parse-blkid-export into cloud-init:master
Status: | Merged | ||||
---|---|---|---|---|---|
Merged at revision: | b7497e807fa12a26d4a12aaf1ee9302a4fd24728 | ||||
Proposed branch: | ~smoser/cloud-init:bug/ds-identify-fix-parse-blkid-export | ||||
Merge into: | cloud-init:master | ||||
Diff against target: |
99 lines (+27/-21) 2 files modified
tests/unittests/test_ds_identify.py (+6/-3) tools/ds-identify (+21/-18) |
||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Chad Smith | Approve | ||
Server Team CI bot | continuous-integration | Approve | |
Review via email: mp+338470@code.launchpad.net |
Commit message
ds-identify: Fix searching for iso9660 OVF cdroms.
This fixes a bug in parsing of 'blkid -o export' output. The result
of the bug meant that DI_ISO9660_DEVS did not get set correctly and
is_cdrom_ovf would not identify devices in most cases.
The tests are improved to demonstrate both multiple iso devices
and also a cdrom that doesn't sort "last" in blkid output.
The code change is to use DEVNAME as the record separator when
parsing blkid -o export rather than relying on being able to read
the empty line.
Description of the change
see commit message
There was an error fetching revisions from git servers. Please try again in a few minutes. If the problem persists, contact Launchpad support.
Thanks Scott for fixing this. One minor comment.