[blivet:rhel7/master 6/8] Only set device for mountpoint if it is not None (#1043763)

mulhern amulhern at redhat.com
Mon Mar 3 21:33:44 UTC 2014


Related: rhbz#1043763

Unless the else is there the block above never has any effect.

Signed-off-by: mulhern <amulhern at redhat.com>
---
 blivet/__init__.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/blivet/__init__.py b/blivet/__init__.py
index c238b84..19bcfb1 100644
--- a/blivet/__init__.py
+++ b/blivet/__init__.py
@@ -1968,8 +1968,8 @@ class Blivet(object):
                     # if the device has been removed don't include this
                     # mountpoint at all
                     del root.mounts[mountpoint]
-
-                root.mounts[mountpoint] = new_dev
+                else:
+                    root.mounts[mountpoint] = new_dev
 
         log.debug("finished Blivet copy")
         return new
-- 
1.8.3.1



More information about the anaconda-patches mailing list