From a7e1405eff489665fbef8518718cf60c3f965b54 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Wed, 5 Jan 2011 17:43:51 +0100 Subject: [PATCH] fix the parted-version selection code, f14 has parted.version broken --- source/steps/InstallPartitionDisks.py | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/source/steps/InstallPartitionDisks.py b/source/steps/InstallPartitionDisks.py index 81d100d..7a31eea 100644 --- a/source/steps/InstallPartitionDisks.py +++ b/source/steps/InstallPartitionDisks.py @@ -183,13 +183,20 @@ def single_partition_device( device, vars, log ): """ # two forms, depending on which version of pyparted we have + # v1 does not have a 'version' method + # v2 and above does, but to make it worse, + # parted-3.4 on f14 has parted.version broken and raises SystemError try: - version=parted.version() + parted.version() return single_partition_device_2_x (device, vars, log) - except: + except AttributeError: + # old parted does not have version at all return single_partition_device_1_x (device, vars, log) - - + except SystemError: + # let's assume this is >=2 + return single_partition_device_2_x (device, vars, log) + except: + raise def single_partition_device_1_x ( device, vars, log): -- 2.43.0