This commit is contained in:
Kovid Goyal 2017-06-15 10:07:08 +05:30
parent 64991c5317
commit 06280ec555
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C

View File

@ -407,9 +407,9 @@ class Device(DeviceConfig, DevicePlugin):
print print
from pprint import pprint from pprint import pprint
pprint({'bsd_drives': bsd_drives, 'mount_map': mount_map, 'drives': drives}) pprint({'bsd_drives': bsd_drives, 'mount_map': mount_map, 'drives': drives})
if drives.get('carda') is None and drives.get('cardb'): if drives.get('carda') is None and drives.get('cardb') is not None:
drives['carda'] = drives.pop('cardb') drives['carda'] = drives.pop('cardb')
if drives.get('main') is None and drives.get('carda'): if drives.get('main') is None and drives.get('carda') is not None:
drives['main'] = drives.pop('carda') drives['main'] = drives.pop('carda')
if drives.get('main') is None: if drives.get('main') is None:
raise DeviceError(_('Unable to detect the %s mount point. Try rebooting.')%self.__class__.__name__) raise DeviceError(_('Unable to detect the %s mount point. Try rebooting.')%self.__class__.__name__)