aboutsummaryrefslogtreecommitdiffstats
path: root/transfugdrake
diff options
context:
space:
mode:
authorChristian Belisle <cbelisle@mandriva.com>2002-01-22 14:47:35 +0000
committerChristian Belisle <cbelisle@mandriva.com>2002-01-22 14:47:35 +0000
commitd7bd836e42d64fd537bf7412a878134df89fddc1 (patch)
tree2f0efc7a69de12c6cbfd2c3c5a53e22fd79c0f8d /transfugdrake
parent7e8ed91fb9263681976fa6c9d81dfbe1d2f95b12 (diff)
downloadtransfugdrake-d7bd836e42d64fd537bf7412a878134df89fddc1.tar
transfugdrake-d7bd836e42d64fd537bf7412a878134df89fddc1.tar.gz
transfugdrake-d7bd836e42d64fd537bf7412a878134df89fddc1.tar.bz2
transfugdrake-d7bd836e42d64fd537bf7412a878134df89fddc1.tar.xz
transfugdrake-d7bd836e42d64fd537bf7412a878134df89fddc1.zip
not allowing double listed users for win95-98
Diffstat (limited to 'transfugdrake')
-rwxr-xr-xtransfugdrake10
1 files changed, 7 insertions, 3 deletions
diff --git a/transfugdrake b/transfugdrake
index bddad2c..63a4984 100755
--- a/transfugdrake
+++ b/transfugdrake
@@ -85,7 +85,7 @@ by migrating your documents, mails and address books"), 1) or quit_global($in, 0
#- **********************************
#- * 1st step: Windows configuration
step_1:
-if($debug) { print "-Getting Windows Configuration\n"; }
+if($debug) { print "- Getting Windows Configuration\n"; }
my ($win_partition, $win_fstype, $win_mountpoint) = transfugdrake::get_windows_config($in);
#- **********************************
@@ -97,7 +97,7 @@ my $addbook_folder_win95 = "$windows_config->{mountpoint}/WINDOWS/Application Da
if($debug) { print "- Windows User Chooser page\n"; }
-if($debug) { print "-- Looking where is the document folder$win_mountpoint\n"; }
+if($debug) { print "-- Looking where is the document folder $win_mountpoint\n"; }
my $document_location = get_documents_folder(@documents_folders, $win_mountpoint);
if($document_location eq "") {
@@ -116,7 +116,11 @@ if($document_location eq $win_mountpoint.'/'.$documents_folders[0]) {
closedir YREP;
foreach my $addbook (@addbook_files) {
$addbook =~ s/.wab//g;
- push(@users, $addbook);
+ foreach my $tmp_ignored (@users) {
+ if($addbook eq $tmp_ignored) { $notvalid = 1; }
+ }
+ if($notvalid != 1) { push(@users, $addbook); }
+ $notvalid = 0;
}
}
elsif($document_location eq $win_mountpoint.'/'.$documents_folders[1]) {