[kernel] r14022 - dists/trunk/linux-2.6/debian/templates/temp.image.plain
Maximilian Attems
maks at alioth.debian.org
Mon Jul 27 12:14:19 UTC 2009
Author: maks
Date: Mon Jul 27 12:14:14 2009
New Revision: 14022
Log:
postinst cleanup overly verbose DEBUG stuff
no need to have code duplication in debug warnings,
as we can read or strace them anyway.
Modified:
dists/trunk/linux-2.6/debian/templates/temp.image.plain/postinst
dists/trunk/linux-2.6/debian/templates/temp.image.plain/prerm
Modified: dists/trunk/linux-2.6/debian/templates/temp.image.plain/postinst
==============================================================================
--- dists/trunk/linux-2.6/debian/templates/temp.image.plain/postinst Mon Jul 27 12:14:01 2009 (r14021)
+++ dists/trunk/linux-2.6/debian/templates/temp.image.plain/postinst Mon Jul 27 12:14:14 2009 (r14022)
@@ -405,9 +405,7 @@
# we should be in dir $dest_dir == $image_dest /, normally
rename("$target", "$target.$$") ||
die "failed to move " . $dest_dir . "$target:$!";
- warn "mv $target $target.$$" if $DEBUG;
}
- warn "mv -f $src_dir$target $target" if $DEBUG;
my $ret = system("mv -f " . $src_dir . "$target " .
" $target");
if ($ret) {
@@ -418,7 +416,6 @@
if (-e "$target.$$") {
rename("$target.$$", "$target.old") ||
die "failed to move " . $dest_dir . "$target:$!";
- warn "mv $target.$$ $target " if $DEBUG;
}
}
@@ -448,13 +445,11 @@
link($Old . "$link_name", $src_dir . "$link_name") ||
die("Failed to hard-link " . $dest_dir . "$link_name to " . $src_dir
. "$link_name .\n");
- warn "ln " . $Old . "$link_name " . $src_dir . "$link_name" if $DEBUG;
}
else {
symlink($Old . "$link_name", $src_dir . "$link_name") ||
die("Failed to symbolically link " . $dest_dir . "$link_name to " . $src_dir .
"$link_name .\n");
- warn "ln -s " . $Old . "$link_name " . $src_dir . "$link_name" if $DEBUG;
}
}
@@ -574,7 +569,6 @@
# don't clobber $kimage.old quite yet
rename("$kimage", "$kimage.$$") ||
die "failed to move " . $image_dest . "$kimage:$!";
- warn "mv $kimage $kimage.$$" if $DEBUG;
my $Old = $src_dir;
my $cwd;
@@ -588,7 +582,6 @@
$Old ="" if $rel_path =~ m/^\s*$/o;
if ($use_hard_links =~ m/YES/i) {
- warn "ln ${Old}${image_name} $kimage" if $DEBUG;
if (! link("${Old}${image_name}", "$kimage")) {
rename("$kimage.$$", "$kimage");
die("Failed to link ${Old}${image_name} to " .
@@ -596,7 +589,6 @@
}
}
else {
- warn "ln -s ${Old}${image_name} $kimage" if $DEBUG;
if (! symlink("${Old}${image_name}", "$kimage")) {
rename("$kimage.$$", "$kimage");
die("Failed to symbolic-link ${Old}${image_name} to " .
@@ -607,12 +599,10 @@
# Ok, now we may clobber the previous .old file
if (-l "$kimage.old" || ! -e "$kimage.old" ) {
rename("$kimage.$$", "$kimage.old");
- warn "mv $kimage.$$ $kimage.old" if $DEBUG;
}
else {
warn "$kimage.old is not a symlink, not clobbering\n";
warn "rm $kimage.$$";
- unlink "$kimage.$$" if $DEBUG;
}
}
@@ -630,7 +620,6 @@
"\t image_name=$image_name, src_dir=$src_dir" if $DEBUG;
if ($no_symlink) {
- warn "cp -a --backup=t $realimageloc$image_name $kimage" if $DEBUG;
my $ret = system("cp -a --backup=t " . $realimageloc .
"$image_name " . " $kimage");
if ($ret) {
@@ -639,7 +628,6 @@
}
}
elsif ($reverse_symlink) {
- warn "mv -f $realimageloc$image_name $kimage" if $DEBUG;
my $ret = system("mv -f " . $realimageloc . "$image_name "
. "$kimage");
if ($ret) {
@@ -701,7 +689,6 @@
symlink($Old . "$Name", "$Link_Dest") ||
die("Failed to symbolic-link ${Old}$Name to $Link_Dest.\n");
- warn "ln -s ${Old}$Name $Link_Dest" if $DEBUG;
}
}
@@ -719,20 +706,17 @@
# Save the current image. We do this in all four cases
rename("$kimage", "$kimage.$$") ||
die "failed to move " . $image_dest . "$kimage:$!";
- warn "mv $kimage $kimage.$$" if $DEBUG;
##,####
# case One
#`####
if ($no_symlink) {
# Maybe /$image_dest is on a dos system?
- warn "cp -a --backup=t $realimageloc$image_name $kimage" if $DEBUG;
my $ret = system("cp -a --backup=t " . $realimageloc
. "$image_name " . "$kimage");
if ($ret) {
if (-e "$kimage.$$") {
rename("$kimage.$$", "$kimage");
- warn "mv $kimage.$$ $kimage" if $DEBUG;
}
die("Failed to copy " . $realimageloc . "$image_name to "
. $image_dest . "$kimage .\n");
@@ -742,13 +726,11 @@
# case Two
#`####
elsif ($reverse_symlink) { # Maybe /$image_dest is on a dos system?
- warn "mv -f $realimageloc$image_name $kimage" if $DEBUG;
my $ret = system("mv -f " . $realimageloc . "$image_name "
. $image_dest . "$kimage");
if ($ret) {
if (-e "$kimage.$$") {
rename("$kimage.$$", "$kimage");
- warn "mv $kimage.$$ $kimage" if $DEBUG;
}
die("Failed to move " . $realimageloc . "$image_name to "
. $image_dest . "$kimage .\n");
@@ -763,14 +745,12 @@
$Old ="" if $rel_path =~ m/^\s*$/o;
if ($use_hard_links =~ m/YES/i) {
- warn "ln " . $Old . "$kimage " . $realimageloc . "$image_name" if $DEBUG;
if (! link($Old . "$kimage", $realimageloc . "$image_name")) {
warn "Could not hard link " . $image_dest .
"$kimage to $image_name :$!";
}
}
else {
- warn "ln -s " . $Old . "$kimage " . $realimageloc . "$image_name" if $DEBUG;
if (! symlink($Old . "$kimage", $realimageloc . "$image_name")) {
warn "Could not symlink " . $image_dest .
"$kimage to $image_name :$!";
@@ -794,9 +774,7 @@
my $rel_path = spath('Old' => "$Old", 'New' => "$cwd" );
$Old ="" if $rel_path =~ m/^\s*$/o;
- warn "ln " . $Old . "$image_name " . "$kimage" if $DEBUG;
if (! link($Old . "$image_name", "$kimage")) {
- warn "mv $kimage.$$ $kimage" if $DEBUG;
rename("$kimage.$$", "$kimage");
die("Failed to hard link " . $realimageloc . "$image_name to "
. $image_dest . "$kimage .\n");
@@ -807,12 +785,10 @@
#`####
else {
# We just use cp
- warn "cp -a --backup=t $realimageloc$image_name $kimage" if $DEBUG;
my $ret = system("cp -a --backup=t " . $realimageloc
. "$image_name " . "$kimage");
if ($ret) {
if (-e "$kimage.$$") {
- warn "mv $kimage.$$ $kimage" if $DEBUG;
rename("$kimage.$$", "$kimage");
}
die("Failed to copy " . $realimageloc . "$image_name to "
@@ -820,7 +796,6 @@
}
}
# Ok, now we may clobber the previous .old file
- warn "mv $kimage.$$ $kimage.old if -e $kimage.$$" if $DEBUG;
rename("$kimage.$$", "$kimage.old") if -e "$kimage.$$";
}
@@ -991,34 +966,6 @@
}
}
-# creating some info about kernel and initrd
-if ($DEBUG) {
- my $ksize=sprintf("%.0f",(stat($realimageloc .
- "$kimage-$version"))[7]/1024)."kB";
- my $initrdsize='';
- if ($initrd) {
- $initrdsize=sprintf("%.0f",(stat($realimageloc .
- "initrd.img-$version"))[7]/1024)."kB";
- }
-
- print STDERR <<"EOMSG";
-A new kernel image has been installed at $realimageloc$kimage-$version
- (Size: $ksize)
-
-Symbolic links, unless otherwise specified, can be found in $image_dest
-
-EOMSG
- ;
-
- if ($initrd) {
- print STDERR <<"EOMSGA";
-
- Initial rootdisk image: ${realimageloc}initrd.img-$version (Size: $initrdsize)
-EOMSGA
- ;
- }
-}
-
# set the env var stem
$ENV{'STEM'} = "=ST";
sub run_hook {
Modified: dists/trunk/linux-2.6/debian/templates/temp.image.plain/prerm
==============================================================================
--- dists/trunk/linux-2.6/debian/templates/temp.image.plain/prerm Mon Jul 27 12:14:01 2009 (r14021)
+++ dists/trunk/linux-2.6/debian/templates/temp.image.plain/prerm Mon Jul 27 12:14:14 2009 (r14022)
@@ -78,8 +78,6 @@
$realimageloc =~ s|^/*|/|o;
$realimageloc =~ s|/+|/|o;
-my $DEBUG = 0;
-
# Variables used
my $image='';
my $ret=0;
More information about the Kernel-svn-changes
mailing list