Skip to content

Commit 35fe83d

Browse files
authored
Merge pull request #217 from richm/bz1985572-1985571
omit unnecessary conditional - deadcode reported by static scanner
2 parents 4eb9661 + 4e27aba commit 35fe83d

File tree

3 files changed

+20
-2
lines changed

3 files changed

+20
-2
lines changed

library/blivet.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -724,13 +724,13 @@ def _create(self):
724724
try:
725725
if create_vdo:
726726
device = self._blivet.new_lv(name=self._volume['name'], vdo_lv=create_vdo,
727-
parents=[vdopool if create_vdo else parent],
727+
parents=[vdopool],
728728
size=size, fmt=fmt)
729729
else:
730730
# This is here for backwards compatibility. Until 8.4 blivet does not support
731731
# vdo_lv optional parameter
732732
device = self._blivet.new_lv(name=self._volume['name'],
733-
parents=[vdopool if create_vdo else parent],
733+
parents=[parent],
734734
size=size, fmt=fmt)
735735
except Exception as e:
736736
raise BlivetAnsibleError("failed to set up volume '%s': %s" % (self._volume['name'], str(e)))
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
---
2+
# This file was generated by generate_tests.py
3+
- hosts: all
4+
tasks:
5+
- name: set disk interface for test
6+
set_fact:
7+
storage_test_use_interface: "nvme"
8+
9+
- import_playbook: tests_lvm_percent_size.yml
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
---
2+
# This file was generated by generate_tests.py
3+
- hosts: all
4+
tasks:
5+
- name: set disk interface for test
6+
set_fact:
7+
storage_test_use_interface: "scsi"
8+
9+
- import_playbook: tests_lvm_percent_size.yml

0 commit comments

Comments
 (0)