QubesOS/qubes-installer-qubes-os
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

anaconda: don't crash when no target disk is available

Browse Source 
self.storage.root_device may be None in such case.
Instead, allow proper reporting that no space is available.
This commit is contained in:
Marek Marczykowski-Górecki 2017-09-05 04:16:31 +02:00
parent b8ceee513f
commit 6b77cb5ae4
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
anaconda/pyanaconda/ui/lib/space.py
View File

@ -75,8 +75,11 @@ class FileSystemSpaceChecker(object):
log.info("fs space: %s needed: %s", free, needed)
self.success = (free > needed)
if not self.success:
dev_required_size = self.payload.requiredDeviceSize(self.storage.root_device.format)
self.deficit = dev_required_size - self.storage.root_device.size
if self.storage.root_device:
dev_required_size = self.payload.requiredDeviceSize(self.storage.root_device.format)
self.deficit = dev_required_size - self.storage.root_device.size
else:
self.deficit = needed - free
self.error_message = _(self.error_template) % self.deficit
return self.success
@ -107,8 +110,11 @@ class DirInstallSpaceChecker(FileSystemSpaceChecker):
log.info("fs space: %s needed: %s", free, needed)
self.success = (free > needed)
if not self.success:
dev_required_size = self.payload.requiredDeviceSize(self.storage.root_device.format)
self.deficit = dev_required_size - self.storage.root_device.size
if self.storage.root_device:
dev_required_size = self.payload.requiredDeviceSize(self.storage.root_device.format)
self.deficit = dev_required_size - self.storage.root_device.size
else:
self.deficit = needed - free
self.error_message = _(self.error_template) % self.deficit
return self.success