Reverse order to handle case of only cardb

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

View File

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