[PATCH] Be more lenient when it comes to deciding if the hdiso method has changed.
Chris Lumens
clumens at redhat.com
Wed Aug 6 15:11:30 UTC 2014
The user can specify "/dev/sda1" or "sda", and they can give the file name with
or without a leading slash. anaconda internally follows different rules, which
leads to situations where we compare "/dev/sda1" to "sda1" and device things
have changed. Of course, they haven't.
---
pyanaconda/ui/gui/spokes/source.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pyanaconda/ui/gui/spokes/source.py b/pyanaconda/ui/gui/spokes/source.py
index 2040ea6..2855e4a 100644
--- a/pyanaconda/ui/gui/spokes/source.py
+++ b/pyanaconda/ui/gui/spokes/source.py
@@ -405,8 +405,8 @@ class SourceSpoke(NormalSpoke, GUISpokeInputCheckHandler):
# The / gets stripped off by payload.ISOImage
self.data.method.dir = "/" + self._currentIsoFile
if (old_source.method == "harddrive" and
- old_source.partition == self.data.method.partition and
- old_source.dir == self.data.method.dir):
+ old_source.partition in [part.name, part.path] and
+ old_source.dir in [self._currentIsoFile, "/" + self._currentIsoFile]):
return False
# Make sure anaconda doesn't touch this device.
--
1.9.3
More information about the anaconda-patches
mailing list