From 568f2abd0b2c50426f7a66d31f8c83748f325536 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20G=C3=A2teau?= Date: Fri, 18 Jul 2014 12:26:12 +0200 Subject: [PATCH] Reproduce and fix bug #28 --- src/modules/partition/CreatePartitionJob.cpp | 2 +- src/modules/partition/tests/JobTests.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/partition/CreatePartitionJob.cpp b/src/modules/partition/CreatePartitionJob.cpp index 0d1e798fd..4e5059435 100644 --- a/src/modules/partition/CreatePartitionJob.cpp +++ b/src/modules/partition/CreatePartitionJob.cpp @@ -83,7 +83,7 @@ CreatePartitionJob::exec() backendPartitionTable->commit(); FileSystem& fs = m_partition->fileSystem(); - if ( fs.type() == FileSystem::Unformatted ) + if ( fs.type() == FileSystem::Unformatted || fs.type() == FileSystem::Extended ) return Calamares::JobResult::ok(); if ( !fs.create( report, partitionPath ) ) diff --git a/src/modules/partition/tests/JobTests.cpp b/src/modules/partition/tests/JobTests.cpp index e650155fa..1064dde90 100644 --- a/src/modules/partition/tests/JobTests.cpp +++ b/src/modules/partition/tests/JobTests.cpp @@ -171,7 +171,7 @@ JobTests::testCreatePartitionExtended() m_queue.enqueue( job_ptr( job ) ); partition = firstFreePartition( m_device->partitionTable() ); - job = newCreatePartitionJob( partition, PartitionRole( PartitionRole::Extended ), FileSystem::Unformatted, 10 * MB); + job = newCreatePartitionJob( partition, PartitionRole( PartitionRole::Extended ), FileSystem::Extended, 10 * MB); job->updatePreview(); m_queue.enqueue( job_ptr( job ) ); Partition* extendedPartition = job->partition();