applied_patches/0190-solenv-installer-cleaner-paths.diff

   1 --- solenv/bin/modules/installer/worker.pm.old  2008-06-23 19:13:40.000000000 +0200
   2 +++ solenv/bin/modules/installer/worker.pm      2008-06-24 14:12:04.000000000 +0200
   3 @@ -765,9 +765,16 @@ sub install_simple ($$$$$$)
   4
   5                 if ((!($dir =~ /\bPREDEFINED_/ )) || ( $dir =~ /\bPREDEFINED_PROGDIR\b/ ))
   6                 {
   7 -                       # printf "mkdir $destdir$onedir->{'HostName'}\n";
   8 -                       mkdir $destdir . $onedir->{'HostName'};
   9 -                       push @lines, "%dir " . $onedir->{'HostName'} . "\n";
  10 +                       my $hostname = $onedir->{'HostName'};
  11 +
  12 +                       # ignore '.' subdirectories
  13 +                       next if ( $hostname =~ m/\.$/ );
  14 +                       # remove './' from the path
  15 +                       $hostname =~ s/\.\///g;
  16 +
  17 +                       # printf "mkdir $destdir$hostname\n";
  18 +                       mkdir $destdir . $hostname;
  19 +                       push @lines, "%dir " . $hostname . "\n";
  20                 }
  21         }
  22
  23 @@ -784,6 +791,10 @@ sub install_simple ($$$$$$)
  24                 $destination =~ s/\$\$/\$/;
  25                 $sourcepath =~ s/\$\$/\$/;
  26
  27 +               # remove './' from the path
  28 +               $sourcepath =~ s/\.\///g;
  29 +               $destination =~ s/\.\///g;
  30 +
  31                 push @lines, "$destination\n";
  32                 # printf "cp $sourcepath $destdir$destination\n";
  33                 copy ("$sourcepath", "$destdir$destination") || die "Can't copy file: $!";