r4637 - in dists/trunk/utils/kernel-package: debian kernel

[Sven Luther]

Author: luther
Date: 2005-10-24 12:13:51 +0000 (Mon, 24 Oct 2005)
New Revision: 4637

Modified:
   dists/trunk/utils/kernel-package/debian/changelog
   dists/trunk/utils/kernel-package/kernel/image.postinst
   dists/trunk/utils/kernel-package/kernel/image.preinst
Log:
used new perl syntax proposed by mauke on #perl. now shift by 8 system return value.


Modified: dists/trunk/utils/kernel-package/debian/changelog
===================================================================
--- dists/trunk/utils/kernel-package/debian/changelog	2005-10-24 11:09:16 UTC (rev 4636)
+++ dists/trunk/utils/kernel-package/debian/changelog	2005-10-24 12:13:51 UTC (rev 4637)
@@ -1,6 +1,6 @@
 kernel-package (9.008.4) unstable; urgency=low
 
-  * Fixed a few small typos.
+  * Some small fixes.
 
  -- Sven Luther <luther at debian.org>  Mon, 24 Oct 2005 11:04:19 +0000
 

Modified: dists/trunk/utils/kernel-package/kernel/image.postinst
===================================================================
--- dists/trunk/utils/kernel-package/kernel/image.postinst	2005-10-24 11:09:16 UTC (rev 4636)
+++ dists/trunk/utils/kernel-package/kernel/image.postinst	2005-10-24 12:13:51 UTC (rev 4637)
@@ -971,24 +971,34 @@
 
 # The initrd symlink should probably be in the same dir that the
 # symlinks are in
+sub system_shift8 {
+  system(@_) >> 8
+}
+sub compare_versions {
+  system_shift8 "dpkg", "--compare-versions", $_[0], "lt", $_[1]
+}
+
 if ($initrd) {
   chomp (my $hostversion = `uname -r`);
   my @ramdisklist =
     grep {
-      my $ret = system ("$_ --supported-host-version=$hostversion --supported-target-version=$version 1>/dev/null 2>&1");
-      -x and (
+      if (-x) {
+        my $ret = system_shift8 "$_ --supported-host-version=$hostversion --supported-target-version=$version 1>/dev/null 2>&1";
         $ret == 0 or (
 	  $ret == 1 and (
-            (($_ eq "/usr/sbin/mkinitrd") and
-	     (system ("dpkg", "--compare-versions", "$version", "lt", "2.6.13") == 0)) or
-            (($_ eq "/usr/sbin/mkinitramfs") and
-	     (system ("dpkg", "--compare-versions", "$version", "lt", "2.6.12") == 1)) or
-            (($_ eq "/usr/sbin/mkinitrd.yaird") and
-	     (system ("dpkg", "--compare-versions", "$version", "lt", "2.6.8") == 1) and
-	     (system ("dpkg", "--compare-versions", "$hostversion", "lt", "2.6.8") == 1))
-	  )
-	)
-      )
+            $_ eq "/usr/sbin/mkinitrd" ?
+              compare_versions($version, "2.6.13") == 0
+            : 
+            $_ eq "/usr/sbin/mkinitramfs" ?
+              compare_versions($version, "2.6.12") == 1
+            : 
+            $_ eq "/usr/sbin/mkinitrd.yaird" ?
+              compare_versions($version, "2.6.8") == 1 && compare_versions($hostversion, "2.6.8") == 1
+            : 
+            0
+          )
+        )
+      }
     }
     (split (/ /, $ramdisk));
 

Modified: dists/trunk/utils/kernel-package/kernel/image.preinst
===================================================================
--- dists/trunk/utils/kernel-package/kernel/image.preinst	2005-10-24 11:09:16 UTC (rev 4636)
+++ dists/trunk/utils/kernel-package/kernel/image.preinst	2005-10-24 12:13:51 UTC (rev 4637)
@@ -180,24 +180,33 @@
 my $pattern = "=" . "I";
 $initrd=~ s/^$pattern$//;
 
+sub system_shift8 {
+  system(@_) >> 8
+}
+sub compare_versions {
+  system_shift8 "dpkg", "--compare-versions", $_[0], "lt", $_[1]
+}
 if ($initrd) {
   chomp (my $hostversion = `uname -r`);
   my @ramdisklist =
     grep {
-      my $ret = system ("$_ --supported-host-version=$hostversion --supported-target-version=$version 1>/dev/null 2>&1");
-      -x and (
+      if (-x) {
+        my $ret = system_shift8 "$_ --supported-host-version=$hostversion --supported-target-version=$version 1>/dev/null 2>&1";
         $ret == 0 or (
 	  $ret == 1 and (
-            (($_ eq "/usr/sbin/mkinitrd") and
-	     (system ("dpkg", "--compare-versions", "$version", "lt", "2.6.13") == 0)) or
-            (($_ eq "/usr/sbin/mkinitramfs") and
-	     (system ("dpkg", "--compare-versions", "$version", "lt", "2.6.12") == 1)) or
-            (($_ eq "/usr/sbin/mkinitrd.yaird") and
-	     (system ("dpkg", "--compare-versions", "$version", "lt", "2.6.8") == 1) and
-	     (system ("dpkg", "--compare-versions", "$hostversion", "lt", "2.6.8") == 1))
-	  )
-	)
-      )
+            $_ eq "/usr/sbin/mkinitrd" ?
+              compare_versions($version, "2.6.13") == 0
+            : 
+            $_ eq "/usr/sbin/mkinitramfs" ?
+              compare_versions($version, "2.6.12") == 1
+            : 
+            $_ eq "/usr/sbin/mkinitrd.yaird" ?
+              compare_versions($version, "2.6.8") == 1 && compare_versions($hostversion, "2.6.8") == 1
+            : 
+            0
+          )
+        )
+      }
     }
     (split (/ /, $ramdisk));