4 files changed, 17 insertions, 13 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index d6cf1a337..3b9ddda54 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,7 @@
+- fix mgaapplet crashing on live migration when there's a new major version of
+  perl (mga#3042)
+- reduce resident memory of net_applet (5Mb aka 11%) & mgapplet (7Mb aka 14%)
+
 Version 13.92 - 11 March 2012
 
 - english message improvement (mga#456)
diff --git a/perl-install/any.pm b/perl-install/any.pm
index fb14558f8..056566314 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -103,18 +103,6 @@ sub add_users {
     }
 }
 
-sub cmp_kernel_versions {
-    my ($va, $vb) = @_;
-    my $rel_a = $va =~ s/-(.*)$// && $1;
-    my $rel_b = $vb =~ s/-(.*)$// && $1;
-    ($va, $vb) = map { [ split /[.-]/ ] } $va, $vb;
-    my $r = 0;
-    mapn_ {
-	$r ||= $_[0] <=> $_[1];
-    } $va, $vb;
-    $r || $rel_a <=> $rel_b || $rel_a cmp $rel_b;
-}
-
 sub install_bootloader_pkgs {
     my ($do_pkgs, $b) = @_;
 
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index 02de18bb8..28a21a242 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -903,7 +903,7 @@ sub get_kernel_labels {
     my ($kernels) = @_;
     
     my @kernels_str = 
-      sort { any::cmp_kernel_versions($b->{version_no_ext}, $a->{version_no_ext}) } 
+      sort { common::cmp_kernel_versions($b->{version_no_ext}, $a->{version_no_ext}) } 
       grep { -d "$::prefix/lib/modules/$_->{version}" }
       map { vmlinuz2kernel_str($_) } @$kernels;
 
diff --git a/perl-install/common.pm b/perl-install/common.pm
index adaa07a0d..7aea9bc17 100644
--- a/perl-install/common.pm
+++ b/perl-install/common.pm
@@ -488,4 +488,16 @@ sub update_gnomekderc_no_create {
     }
 }
 
+sub cmp_kernel_versions {
+    my ($va, $vb) = @_;
+    my $rel_a = $va =~ s/-(.*)$// && $1;
+    my $rel_b = $vb =~ s/-(.*)$// && $1;
+    ($va, $vb) = map { [ split /[.-]/ ] } $va, $vb;
+    my $r = 0;
+    mapn_ {
+	$r ||= $_[0] <=> $_[1];
+    } $va, $vb;
+    $r || $rel_a <=> $rel_b || $rel_a cmp $rel_b;
+}
+
 1;