summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2015-12-01 23:35:21 +0000
committerintrigeri <intrigeri@boum.org>2015-12-01 23:35:21 +0000
commit51a1ee77a180707f90ad6f29de90712c213eb39d (patch)
treeac2046d0d52cba3c79f936a1d0bd9163a16cef95
parent5866a60c79be6c606048713fa1a01348d2b4e92d (diff)
parent2683af68b8f18d3033f73f5f85d1324855bb3809 (diff)
Merge remote-tracking branch '451f/bugfix/10660+dontcrashpristineusb' into feature/jessie (Closes: #10660)
-rwxr-xr-xtails_installer/creator.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/tails_installer/creator.py b/tails_installer/creator.py
index a0e6fe6..4f04b12 100755
--- a/tails_installer/creator.py
+++ b/tails_installer/creator.py
@@ -910,6 +910,10 @@ class LinuxTailsInstallerCreator(TailsInstallerCreator):
obj = self._get_object(drive['udi'])
else:
obj = self._get_object()
+
+ if not obj.props.partition :
+ return False
+
partition_table = obj.props.partition_table
if not partition_table:
partition_table = self._udisksclient.get_partition_table(obj.props.partition)