[rhel7-branch 1/1] Use the return of findActiveDevicesOnActionDisks() properly

mopsfelder installerbot-noreply at redhat.com
Wed May 20 20:44:43 UTC 2015


From: Murilo Opsfelder Araujo <mopsfelder at gmail.com>

The function findActiveDevicesOnActionDisks() does return a list of
device names, i.e. a list of strings, not a list of devices.

Without this fix, an AttributeError is throwned before the RuntimeError,
see:

  File "/usr/lib/python2.7/site-packages/blivet/devicetree.py", line 354, in processActions
    self._preProcessActions()
  File "/usr/lib/python2.7/site-packages/blivet/devicetree.py", line 258, in _preProcessActions
    ",".join(p.name for p in problematic))
  File "/usr/lib/python2.7/site-packages/blivet/devicetree.py", line 258, in <genexpr>
    ",".join(p.name for p in problematic))
AttributeError: 'str' object has no attribute 'name'
---
 blivet/devicetree.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/blivet/devicetree.py b/blivet/devicetree.py
index 97dd6d4..8be855a 100644
--- a/blivet/devicetree.py
+++ b/blivet/devicetree.py
@@ -255,7 +255,7 @@ def _preProcessActions(self):
             else:
                 raise RuntimeError("partitions in use on disks with changes "
                                    "pending: %s" %
-                                   ",".join(p.name for p in problematic))
+                                   ",".join(problematic))
 
         log.info("resetting parted disks...")
         for device in self.devices:


-- 
To view this commit on github, visit https://github.com/rhinstaller/blivet/commit/de89a345f0cb488f1cf542bc49b0a6f9f1055d90


More information about the anaconda-patches mailing list