solenv/bin/modules/installer/systemactions.pm | 32 --------------------------
1 file changed, 32 deletions(-)
New commits:
commit c44c21a01321650f930d9e16b4d0763d5674eac1
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Fri Sep 4 15:51:08 2020 +0300
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Fri Sep 4 16:19:08 2020 +0200
Drop duplicating is_empty_dir
This version was introduced in b173b425a1c1478ab3c4b43e58e09b751e3e3387,
then in cabadfc288e5e7324723c62f36b918a80db90323, another copy was added
so that now install.phony.log had this line:
Subroutine is_empty_dir redefined at
C:/lo/src/core/solenv/bin/modules/installer/systemactions.pm line 475.
Let's keep the newer version, that is at line 280.
Change-Id: I50f3668e47d4ea8f9c309abde8abe233cff12af5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102046
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
diff --git a/solenv/bin/modules/installer/systemactions.pm
b/solenv/bin/modules/installer/systemactions.pm
index 4f7a18bba5e6..a33c5a957b06 100644
--- a/solenv/bin/modules/installer/systemactions.pm
+++ b/solenv/bin/modules/installer/systemactions.pm
@@ -466,38 +466,6 @@ sub copy_directory
}
}
-##########################################
-# Copying all files from one directory
-# to another directory
-##########################################
-
-sub is_empty_dir
-{
- my ($dir) = @_;
-
- my $directory_is_empty = 1;
- my @sourcefiles = ();
-
- opendir(DIR, $dir);
- @sourcefiles = readdir(DIR);
- closedir(DIR);
-
- my $onefile;
- my @realcontent = ();
-
- foreach $onefile (@sourcefiles)
- {
- if ((!($onefile eq ".")) && (!($onefile eq "..")))
- {
- push(@realcontent, $onefile);
- }
- }
-
- if ( $#realcontent > -1 ) { $directory_is_empty = 0; }
-
- return $directory_is_empty;
-}
-
#####################################################################
# Creating hard links to a complete directory with sub directories.
#####################################################################
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
