[PATCH 04/12] Prevent BTRFS volumes from ever having the name None.
David Lehman
dlehman at redhat.com
Thu Oct 4 22:10:08 UTC 2012
Related: rhbz#858139
---
pyanaconda/storage/devices.py | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/pyanaconda/storage/devices.py b/pyanaconda/storage/devices.py
index 00285a7..65eff82 100644
--- a/pyanaconda/storage/devices.py
+++ b/pyanaconda/storage/devices.py
@@ -3937,14 +3937,13 @@ class BTRFSVolumeDevice(BTRFSDevice):
device=self.path)
self.originalFormat = copy.copy(self.format)
- label = getattr(self.format, "label", None)
- if label:
- self._name = label
-
def _setFormat(self, format):
""" Set the Device's format. """
super(BTRFSVolumeDevice, self)._setFormat(format)
- self._name = getattr(self.format, "label", "btrfs.%d" % self.id)
+ self._name = "btrfs.%d" % self.id
+ label = getattr(self.format, "label", None)
+ if label:
+ self._name = label
def _addDevice(self, device):
""" Add a new device to this volume.
--
1.7.7.6
More information about the anaconda-patches
mailing list