fixes to previous commit (to be squashed)

- removed leftover debug messages from test_fsset.py
- removed unused imports from fsset.py
- changed variable's names to correct values in root.py

pyanaconda/modules/storage/devicetree/fsset.py

@@ -21,14 +21,13 @@
 
 from blivet import blockdev
 from blivet.fstab import FSTabManager
-from blivet.devices import NoDevice, DirectoryDevice, NFSDevice, FileDevice, MDRaidArrayDevice, \
+from blivet.devices import NoDevice, DirectoryDevice, FileDevice, MDRaidArrayDevice, \
     NetworkStorageDevice, OpticalDevice
-from blivet.errors import UnrecognizedFSTabEntryError, FSTabTypeMismatchError, SwapSpaceError
-from blivet.formats import get_format, get_device_format_class
+from blivet.errors import UnrecognizedFSTabEntryError, SwapSpaceError
+from blivet.formats import get_format
 from blivet.storage_log import log_exception_info
 
 from pyanaconda.core.configuration.anaconda import conf
-from pyanaconda.core.i18n import _
 from pyanaconda.modules.storage.platform import platform, EFI
 
 from pyanaconda.anaconda_loggers import get_module_logger

pyanaconda/modules/storage/devicetree/root.py

@@ -287,8 +287,8 @@ def _parse_fstab(devicetree, chroot):
             continue
 
         # If a btrfs volume is found but a subvolume is expected, ignore the volume.
-        if device.type == "btrfs volume" and "subvol=" in options:
-            log.debug("subvolume from %s for %s not found", options, devspec)
+        if device.type == "btrfs volume" and "subvol=" in entry.mntops:
+            log.debug("subvolume from %s for %s not found", entry.mntops, entry.spec)
             continue
 
         if entry.vfstype != "swap":

tests/unit_tests/pyanaconda_tests/modules/storage/test_fsset.py

@@ -247,6 +247,3 @@ def test_root_parse_fstab(self):
 
         self.assertEqual(mounts["/mnt/testmount"], test_dev)
         self.assertTrue(test_dev in devices)
-
-        print("MYDEBUG: %s" % mounts)
-        print("MYDEBUG: %s" % devices)