On Mon, 2009-04-06 at 17:43 +0200, Hans de Goede wrote:
> ---
> storage/partitioning.py | 11 +++++++----
> 1 files changed, 7 insertions(+), 4 deletions(-)
Looks good.
>
> diff --git a/storage/partitioning.py b/storage/partitioning.py
> index 0f741ec..23f0c24 100644
> --- a/storage/partitioning.py
> +++ b/storage/partitioning.py
> @@ -31,7 +31,7 @@ from constants import *
>
> from errors import *
> from deviceaction import *
> -from devices import PartitionDevice, LUKSDevice
> +from devices import PartitionDevice, LUKSDevice, devicePathToName
>
> import gettext
> _ = lambda x: gettext.ldgettext("anaconda", x)
> @@ -565,8 +565,11 @@ def doPartitioning(storage, exclusiveDisks=None):
> # them to the tree now
> for disk in disks:
> extended = disk.partedDisk.getExtendedPartition()
> - if not extended or \
> - extended.getDeviceNodeName() in [p.name for p in partitions]:
> + if not extended:
> + continue
> +
> + extendedName = devicePathToName(extended.getDeviceNodeName())
> + if extendedName in [p.name for p in partitions]:
> # this extended partition is preexisting
> continue
>
> @@ -574,7 +577,7 @@ def doPartitioning(storage, exclusiveDisks=None):
> # that does not exist means leaving self.parents empty and instead
> # populating self.req_disks. In this case, we need to skip past
> # that since this partition is already defined.
> - device = PartitionDevice(extended.getDeviceNodeName(), parents=disk)
> + device = PartitionDevice(extendedName, parents=disk)
> device.parents = [disk]
> device.partedPartition = extended
> storage.createDevice(device)
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
