[Libreoffice-commits] .: patches/dev300

[Petr Mladek]

 patches/dev300/apply                               |    4 --
 patches/dev300/solenv-installer-cleaner-paths.diff |   38 ---------------------
 2 files changed, 42 deletions(-)

New commits:
commit 1df80524f2bcd39c86bf1ccfbed05e6928ad5440
Author: Petr Mladek <pmladek at suse.cz>
Date:   Wed Mar 30 17:20:38 2011 +0200

    pushed solenv-installer-cleaner-paths.diff into git

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 06039b2..008e51d 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -420,10 +420,6 @@ jvmfwk-disable-gcj.diff
 libxmlsec-system-nss.diff, i#69368, n#195272, pmladek
 
 [ BuildBits ]
-# do not create '.' subdirectories
-# omit './' in paths
-solenv-installer-cleaner-paths.diff, pmladek
-
 # do not print twice the lang name in the filelist
 # for example, generate gid_Module_Langpack_Basis_es instead of
 # gid_Module_Langpack_Basis_es.es
diff --git a/patches/dev300/solenv-installer-cleaner-paths.diff b/patches/dev300/solenv-installer-cleaner-paths.diff
deleted file mode 100644
index c929357..0000000
--- a/patches/dev300/solenv-installer-cleaner-paths.diff
+++ /dev/null
@@ -1,38 +0,0 @@
----
- solenv/bin/modules/installer/worker.pm |   17 ++++++++++++++---
- 1 files changed, 14 insertions(+), 3 deletions(-)
-
-diff --git solenv/bin/modules/installer/worker.pm solenv/bin/modules/installer/worker.pm
-index 2c26290..f2531b1 100644
---- solenv/bin/modules/installer/worker.pm
-+++ solenv/bin/modules/installer/worker.pm
-@@ -773,8 +773,16 @@ sub install_simple ($$$$$$)
-     
-         if ((!($dir =~ /\bPREDEFINED_/ )) || ( $dir =~ /\bPREDEFINED_PROGDIR\b/ ))
-         {
--            mkdir $destdir . $onedir->{'HostName'};
--            push @lines, "%dir " . $onedir->{'HostName'} . "\n";
-+            my $hostname = $onedir->{'HostName'};
-+
-+            # ignore '.' subdirectories
-+            next if ( $hostname =~ m/\.$/ );
-+            # remove './' from the path
-+            $hostname =~ s/\.\///g;
-+
-+            # printf "mkdir $destdir$hostname\n";
-+            mkdir $destdir . $hostname;
-+            push @lines, "%dir " . $hostname . "\n";
-         }
-     }
- 
-@@ -792,6 +799,10 @@ sub install_simple ($$$$$$)
-         $destination =~ s/\$\$/\$/;
-         $sourcepath =~ s/\$\$/\$/;
- 
-+        # remove './' from the path
-+        $sourcepath =~ s/\.\///g;
-+        $destination =~ s/\.\///g;
-+
-         push @lines, "$destination\n";
-         if(-d  "$destdir$destination"){
-             rmtree("$destdir$destination");