diff options
Diffstat (limited to 'zarb-ml/mageia-dev/2012-May/015405.html')
| -rw-r--r-- | zarb-ml/mageia-dev/2012-May/015405.html | 204 |
1 files changed, 204 insertions, 0 deletions
diff --git a/zarb-ml/mageia-dev/2012-May/015405.html b/zarb-ml/mageia-dev/2012-May/015405.html new file mode 100644 index 000000000..af000c501 --- /dev/null +++ b/zarb-ml/mageia-dev/2012-May/015405.html @@ -0,0 +1,204 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN"> +<HTML> + <HEAD> + <TITLE> [Mageia-dev] [soft-commits] [4253] reuse code from hd_gtk, fixes display of "Use free space" solution + </TITLE> + <LINK REL="Index" HREF="index.html" > + <LINK REL="made" HREF="mailto:mageia-dev%40mageia.org?Subject=Re%3A%20%5BMageia-dev%5D%20%5Bsoft-commits%5D%20%5B4253%5D%20reuse%20code%20from%20hd_gtk%2C%0A%20fixes%20display%20of%20%22Use%20free%20space%22%20solution&In-Reply-To=%3CCAONrEtapk7U1zhk3FVk3k-Sb92CcLQ06kavkupBDAsorGStLcg%40mail.gmail.com%3E"> + <META NAME="robots" CONTENT="index,nofollow"> + <META http-equiv="Content-Type" content="text/html; charset=us-ascii"> + <LINK REL="Previous" HREF="015471.html"> + <LINK REL="Next" HREF="015406.html"> + </HEAD> + <BODY BGCOLOR="#ffffff"> + <H1>[Mageia-dev] [soft-commits] [4253] reuse code from hd_gtk, fixes display of "Use free space" solution</H1> + <B>Thierry Vignaud</B> + <A HREF="mailto:mageia-dev%40mageia.org?Subject=Re%3A%20%5BMageia-dev%5D%20%5Bsoft-commits%5D%20%5B4253%5D%20reuse%20code%20from%20hd_gtk%2C%0A%20fixes%20display%20of%20%22Use%20free%20space%22%20solution&In-Reply-To=%3CCAONrEtapk7U1zhk3FVk3k-Sb92CcLQ06kavkupBDAsorGStLcg%40mail.gmail.com%3E" + TITLE="[Mageia-dev] [soft-commits] [4253] reuse code from hd_gtk, fixes display of "Use free space" solution">thierry.vignaud at gmail.com + </A><BR> + <I>Wed May 9 11:38:38 CEST 2012</I> + <P><UL> + <LI>Previous message: <A HREF="015471.html">[Mageia-dev] freeze push: sqlite 3.7.11 +</A></li> + <LI>Next message: <A HREF="015406.html">[Mageia-dev] [soft-commits] [4253] reuse code from hd_gtk, fixes display of "Use free space" solution +</A></li> + <LI> <B>Messages sorted by:</B> + <a href="date.html#15405">[ date ]</a> + <a href="thread.html#15405">[ thread ]</a> + <a href="subject.html#15405">[ subject ]</a> + <a href="author.html#15405">[ author ]</a> + </LI> + </UL> + <HR> +<!--beginarticle--> +<PRE>On 24 April 2012 23:58, <<A HREF="https://www.mageia.org/mailman/listinfo/mageia-dev">root at mageia.org</A>> wrote: +><i> Revision 4253 Author pterjan Date 2012-04-24 23:58:30 +0200 (Tue, 24 Apr +</I>><i> 2012) +</I>><i> +</I>><i> Log Message +</I>><i> +</I>><i> reuse code from hd_gtk, fixes display of "Use free space" solution +</I> +Now upgrading a RAID fails again. +Once you select the RAID in the pull down menu, the partitionning wizard +complains: +"Error: Not an ARRAY reference at (...)diskdrake/hd_gtk.pm line 441" + +Only solution is back to custom partitioning... + +><i> Modified: drakx/trunk/perl-install/diskdrake/hd_gtk.pm +</I>><i> =================================================================== +</I>><i> --- drakx/trunk/perl-install/diskdrake/hd_gtk.pm 2012-04-24 21:17:30 UTC +</I>><i> (rev 4252) +</I>><i> +++ drakx/trunk/perl-install/diskdrake/hd_gtk.pm 2012-04-24 21:58:30 UTC +</I>><i> (rev 4253) +</I>><i> @@ -250,13 +250,8 @@ +</I>><i> my ($_in, $kind) = @_; +</I>><i> +</I>><i> $_->destroy foreach $kind->{display_box}->get_children; +</I>><i> - +</I>><i> - my $v = $kind->{val}; +</I>><i> - my @parts = +</I>><i> - $kind->{type} eq 'raid' ? grep { $_ } @$v : +</I>><i> - $kind->{type} eq 'loopback' ? @$v : fs::get::hds_fstab_and_holes($v); +</I>><i> - my $totalsectors = +</I>><i> - $kind->{type} =~ /raid|loopback/ ? sum(map { $_->{size} } @parts) : +</I>><i> $v->{totalsectors}; +</I>><i> + my @parts = kind2parts($kind); +</I>><i> + my $totalsectors = kind2sectors($kind, @parts); +</I>><i> create_buttons4partitions($kind, $totalsectors, @parts); +</I>><i> } +</I>><i> +</I>><i> @@ -433,6 +428,21 @@ +</I>><i> } +</I>><i> } +</I>><i> +</I>><i> +sub kind2parts { +</I>><i> + my ($kind) = @_; +</I>><i> + my $v = $kind->{val}; +</I>><i> + my @parts = +</I>><i> + $kind->{type} eq 'raid' ? grep { $_ } @$v : +</I>><i> + $kind->{type} eq 'loopback' ? @$v : fs::get::hds_fstab_and_holes($v); +</I>><i> + @parts; +</I>><i> +} +</I>><i> + +</I>><i> +sub kind2sectors { +</I>><i> + my ($kind, @parts) = @_; +</I>><i> + my $v = $kind->{val}; +</I>><i> + $kind->{type} =~ /raid|loopback/ ? sum(map { $_->{size} } @parts) : +</I>><i> $v->{totalsectors}; +</I>><i> +} +</I>><i> + +</I>><i> +</I>><i> ################################################################################ +</I>><i> # lvms: helpers +</I>><i> +</I>><i> ################################################################################ +</I>><i> +</I>><i> Modified: drakx/trunk/perl-install/fs/partitioning_wizard.pm +</I>><i> =================================================================== +</I>><i> --- drakx/trunk/perl-install/fs/partitioning_wizard.pm 2012-04-24 21:17:30 +</I>><i> UTC (rev 4252) +</I>><i> +++ drakx/trunk/perl-install/fs/partitioning_wizard.pm 2012-04-24 21:58:30 +</I>><i> UTC (rev 4253) +</I>><i> @@ -287,10 +287,9 @@ +</I>><i> +</I>><i> sub create_display_box { +</I>><i> my ($kind, $resize, $fill_empty, $button) = @_; +</I>><i> - # perl_checker: require UNIVERSAL +</I>><i> - my @parts = fs::get::hds_fstab_and_holes($kind->{val}) if +</I>><i> UNIVERSAL::can($kind->{val}, 'first_usable_sector,'); +</I>><i> +</I>><i> - my $totalsectors = $kind->{val}{totalsectors}; +</I>><i> + my @parts = diskdrake::hd_gtk::kind2parts($kind); +</I>><i> + my $totalsectors = diskdrake::hd_gtk::kind2sectors($kind, @parts); +</I>><i> +</I>><i> my $width = 540; +</I>><i> my $minwidth = 40; +</I>><i> +</I>><i> Modified: drakx/trunk/perl-install/install/NEWS +</I>><i> =================================================================== +</I>><i> --- drakx/trunk/perl-install/install/NEWS 2012-04-24 21:17:30 UTC (rev 4252) +</I>><i> +++ drakx/trunk/perl-install/install/NEWS 2012-04-24 21:58:30 UTC (rev 4253) +</I>><i> @@ -7,6 +7,7 @@ +</I>><i> o systemd support (mga#3253, mga#3740, mga#4910, mga#5122) +</I>><i> - partitioning wizard: +</I>><i> o fix removing several notebook pages +</I>><i> + o reuse code from hd_gtk, fixes display of "Use free space" solution +</I>><i> +</I>><i> Version 14.10 - 23 April 2012 +</I>><i> +</I>><i> +</I></PRE> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +<!--endarticle--> + <HR> + <P><UL> + <!--threads--> + <LI>Previous message: <A HREF="015471.html">[Mageia-dev] freeze push: sqlite 3.7.11 +</A></li> + <LI>Next message: <A HREF="015406.html">[Mageia-dev] [soft-commits] [4253] reuse code from hd_gtk, fixes display of "Use free space" solution +</A></li> + <LI> <B>Messages sorted by:</B> + <a href="date.html#15405">[ date ]</a> + <a href="thread.html#15405">[ thread ]</a> + <a href="subject.html#15405">[ subject ]</a> + <a href="author.html#15405">[ author ]</a> + </LI> + </UL> + +<hr> +<a href="https://www.mageia.org/mailman/listinfo/mageia-dev">More information about the Mageia-dev +mailing list</a><br> +</body></html> |