[kernel] r16234 - dists/trunk/linux-2.6/debian/templates/temp.image.plain

Ben Hutchings benh at alioth.debian.org
Fri Sep 3 22:29:30 UTC 2010


Author: benh
Date: Fri Sep  3 22:29:24 2010
New Revision: 16234

Log:
Remove check() subroutine

This has been broken since kernel-package 10.037 because it uses '+='
instead of '.='.  Since no-one seems to care, remove it rather than
fixing it.

Modified:
   dists/trunk/linux-2.6/debian/templates/temp.image.plain/preinst

Modified: dists/trunk/linux-2.6/debian/templates/temp.image.plain/preinst
==============================================================================
--- dists/trunk/linux-2.6/debian/templates/temp.image.plain/preinst	Wed Sep  1 23:28:48 2010	(r16233)
+++ dists/trunk/linux-2.6/debian/templates/temp.image.plain/preinst	Fri Sep  3 22:29:24 2010	(r16234)
@@ -76,54 +76,6 @@
 $ENV{KERNEL_ARCH}=$kernel_arch if $kernel_arch;
 
 
-sub check {
-  my $version = shift;
-  my $lib_modules="$modules_base/$version";
-  my $message = '';
-
-  if (-d "$lib_modules") {
-    opendir(DIR, $lib_modules) || die "can’t opendir $lib_modules: $!";
-    my @children = readdir(DIR);
-    if ($#children > 1) {
-      my @dirs  = grep { -d "$lib_modules/$_" } @children;
-      if ($#dirs > 1) { # we have subdirs
-        my $dir_message='';
-        for my $dir (@dirs) {
-          if ($dir =~/kernel$/) {
-            $dir_message="An older install was detected.\n";
-          }
-          else {
-            $dir_message="Module sub-directories were detected.\n"
-              unless $dir_message;
-          }
-        }
-        $message += $dir_message if $dir_message;
-      }
-
-      my @links = grep { -l "$lib_modules/$_" } @children;
-      if ($#links > -1) {
-        my $links_message = '';
-        for my $link (@links) {
-          next if ($link =~ /^build$/);
-          next if ($link =~ /^source$/);
-          $links_message = "Symbolic links were detected in $modules_base/$version.\n";
-        }
-        $message += $links_message if $links_message;
-      }
-      my @files = grep { -f "$lib_modules/$_" } @children;
-      $message += "Additional files also exist in $modules_base/$version.\n"
-        if ($#files > -1);
-    }
-  }
-  else { $message .= "$lib_modules does not exist. ";}
-  return $message;
-}
-
-if (-d "$modules_base/$version") {
-  my $errors=check($version);
-  warn "Info:\n$errors\n" if $errors;
-}
-
 if (-d "$modules_base/$version" && -l "$modules_base/$version/build" ) {
 	rename("$modules_base/$version/build", "$modules_base/$version/build.save") ||
 	die "failed to move $modules_base/$version/build:$!";



More information about the Kernel-svn-changes mailing list