From 63ede14df82cbf0ab8fa4a580f6ab76ef6c5ba8f Mon Sep 17 00:00:00 2001 From: Chris Lumens Date: Wed, 29 Jul 2009 14:30:37 -0400 Subject: Not all udev info blocks return a name, so provide a way to ignore it. --- storage/udev.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'storage/udev.py') diff --git a/storage/udev.py b/storage/udev.py index 24b86be40..051dc21e9 100644 --- a/storage/udev.py +++ b/storage/udev.py @@ -100,7 +100,7 @@ def enumerate_block_devices(): devices.append(sysfs_path) return devices -def udev_get_block_device(sysfs_path): +def udev_get_block_device(sysfs_path, requireName=True): if not os.path.exists(sysfs_path): log.debug("%s does not exist" % sysfs_path) return None @@ -114,7 +114,7 @@ def udev_get_block_device(sysfs_path): entry = open(db_path).read() dev = udev_parse_block_entry(entry) - if dev.has_key("name"): + if requireName and dev.has_key("name"): # XXX why do we do this? is /sys going to move during installation? dev['sysfs_path'] = sysfs_path[4:] # strip off the leading '/sys' dev = udev_parse_uevent_file(dev) -- cgit