diff options
| author | Oliver Tappe | 2007-07-22 11:41:31 +0200 |
|---|---|---|
| committer | Oliver Tappe | 2007-07-22 11:41:31 +0200 |
| commit | 98d1d7b7b74c5157f2a0c8bca1f9347924bad8ff (patch) | |
| tree | abfbf23f6277ae89044c3dd2777ef7470c9dd9d1 | |
| parent | * fixed compatibility problems of our config-files with regards to being (diff) | |
| download | core-98d1d7b7b74c5157f2a0c8bca1f9347924bad8ff.tar.gz core-98d1d7b7b74c5157f2a0c8bca1f9347924bad8ff.tar.xz core-98d1d7b7b74c5157f2a0c8bca1f9347924bad8ff.zip | |
* fixed glob()-related hang in slxldd.
git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1270 95ad53e4-c205-0410-b2fa-d234c58c8868
| -rwxr-xr-x | bin/slxldd | 3 | ||||
| -rw-r--r-- | lib/OpenSLX/Basics.pm | 2 |
2 files changed, 3 insertions, 2 deletions
@@ -111,7 +111,8 @@ sub fetchLoaderConfigFile while (<$ldconfFH>) { chomp; if (m{^\s*include\s+(.+?)\s*$}i) { - while (my $incFile = glob("$rootPath$1")) { + my @incFiles = glob("$rootPath$1"); + foreach my $incFile (@incFiles) { if ($incFile) { fetchLoaderConfigFile($incFile); } diff --git a/lib/OpenSLX/Basics.pm b/lib/OpenSLX/Basics.pm index 3aebb54e..d26cf195 100644 --- a/lib/OpenSLX/Basics.pm +++ b/lib/OpenSLX/Basics.pm @@ -474,7 +474,7 @@ sub glob { return map { decode('utf8', $_); - } File::Glob::bsd_glob(@_); + } (File::Glob::bsd_glob(@_)); } # ------------------------------------------------------------------------------ |