From 9be8aa0f732b2a99767df8a0eee8ebc9414d2b3b Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mageia.org>
Date: Tue, 11 Dec 2012 13:18:06 +0000
Subject: (part) if a partition has been manually formated, don't offer to
 format it again (for draklive-install, mga#7822)

---
 perl-install/NEWS         | 4 ++++
 perl-install/fs/format.pm | 1 +
 perl-install/install/NEWS | 4 ++++
 3 files changed, 9 insertions(+)

(limited to 'perl-install')

diff --git a/perl-install/NEWS b/perl-install/NEWS
index 4d24633c6..6e48a7af2 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,7 @@
+- library:
+  o if a partition has been manually formated, don't offer to format
+    it again (for draklive-install, mga#7822)
+
 Version 15.3 - 9 December 2012
 
 - finish-install:
diff --git a/perl-install/fs/format.pm b/perl-install/fs/format.pm
index c511cf51d..5b87f22f1 100644
--- a/perl-install/fs/format.pm
+++ b/perl-install/fs/format.pm
@@ -114,6 +114,7 @@ sub part {
 	$wait_message->(N("Formatting partition %s", $part->{device})) if $wait_message;
 	part_raw($part, $wait_message);
     }
+    undef $part->{toFormat};
 }
 
 sub write_label {
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 4a4b95504..fb69e5e5b 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,7 @@
+- partitionning:
+  o if a partition has been manually formated, don't offer to format
+    it again (mga#7822)
+
 Version 15.8 - 11 December 2012
 
 - fix installing basesystem prior to adding a supplementary network
-- 
cgit v1.2.1