diff options
author | Chris Lumens <clumens@redhat.com> | 2007-06-29 18:48:25 +0000 |
---|---|---|
committer | Chris Lumens <clumens@redhat.com> | 2007-06-29 18:48:25 +0000 |
commit | cbbfb16f49b21866a3cf23d23075e968d1057622 (patch) | |
tree | 533f8294181bd61f4d5c1418ea6fa1122c474f95 /fsset.py | |
parent | dfd4eecea2f4c40629fe0b14df5711a0e4e845df (diff) | |
download | anaconda-cbbfb16f49b21866a3cf23d23075e968d1057622.tar.gz anaconda-cbbfb16f49b21866a3cf23d23075e968d1057622.tar.xz anaconda-cbbfb16f49b21866a3cf23d23075e968d1057622.zip |
Fix an fsset entry sorting problem (#242294, patch from Jeffrey Hutzelman
<jhutz AT cmu DOT edu>).
Diffstat (limited to 'fsset.py')
-rw-r--r-- | fsset.py | 12 |
1 files changed, 5 insertions, 7 deletions
@@ -1136,15 +1136,13 @@ class FileSystemSet: devA = a.device.getDevice() devB = b.device.getDevice() - if not mntB or not devB: - return True - if not mntA or not devA: + if not mntB: return False - - if (mntA.startswith(mntB) and mntA != mntB) or (devA.startswith(mntB) and devA != devB): + if mntA and mntA != mntB and mntA.startswith(mntB): return True - else: - return False + if devA and devA != mntB and devA.startswith(mntB): + return True + return False # Remove preexisting duplicate entries - pseudo filesystems are # duplicate if they have the same filesystem type as an existing one. |