* dropped our own implementation of glob() - that was a fix at the wrong place.

  We now explicitly ecode the string before we are printing it.

git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1271 95ad53e4-c205-0410-b2fa-d234c58c8868

2 files changed, 6 insertions, 4 deletions

diff --git a/installer/slxos-export b/installer/slxos-export
index 2533aa1f..be63068d 100755
--- a/installer/slxos-export
+++ b/installer/slxos-export
@@ -18,6 +18,7 @@ slxos-export
     OpenSLX-script to generate an export from a vendor-OS.
 ];
 
+use Encode;
 use Getopt::Long qw(:config pass_through);
 use Pod::Usage;
 
@@ -64,10 +65,10 @@ if ($action =~ m[^list-ex]i) {
 	foreach my $type (sort keys %supportedExportFileSystems) {
 		# list all image files, followed by the block devices using it:
 		my @files = map {
-			my $image = $_;
+			my $image = decode('utf8', $_);
 			$image =~ s[^.+/][];
 			$image;
-		} sort <$openslxConfig{'public-path'}/export/$type/*>;
+		} sort glob("$openslxConfig{'public-path'}/export/$type/*");
 		my %imageFiles;
 		foreach my $file (@files) {
 			if ($file =~ m[^(.+)@(.+)$]) {
@@ -103,7 +104,7 @@ if ($action =~ m[^list-ex]i) {
 	print join(
 		'',
 		map {
-			my $vendorOS = $_;
+			my $vendorOS = decode('utf8', $_);
 			$vendorOS =~ s[^.+/][];
 			"\t$vendorOS\n";
 		  }
diff --git a/installer/slxos-setup b/installer/slxos-setup
index 1d323738..b7461deb 100755
--- a/installer/slxos-setup
+++ b/installer/slxos-setup
@@ -19,6 +19,7 @@ slxos-setup
     a stage1 system for OpenSLX.
 ];
 
+use Encode;
 use Getopt::Long qw(:config pass_through);
 use Pod::Usage;
 
@@ -159,7 +160,7 @@ if ($action =~ m[^import]i) {
 	print join(
 		'', 
 		map {
-			my $vendorOS = $_;
+			my $vendorOS = decode('utf8', $_);
 			$vendorOS =~ s[^.+/][];
 			"\t$vendorOS\n";
 		}