diff options
| author | Olivier Blin <oblin@mandriva.org> | 2006-02-23 12:22:47 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.org> | 2006-02-23 12:22:47 +0000 |
| commit | bad0205fe4ebd9c386a9483a5f9b1a29c6dfd030 (patch) | |
| tree | f5492d068f665284b8f63a79ea77880ac4cc1328 /live/draklive-install | |
| parent | c372eb0cd4b482802fb21048fa3633701b06d72e (diff) | |
| download | drakx-backup-do-not-use-bad0205fe4ebd9c386a9483a5f9b1a29c6dfd030.tar drakx-backup-do-not-use-bad0205fe4ebd9c386a9483a5f9b1a29c6dfd030.tar.gz drakx-backup-do-not-use-bad0205fe4ebd9c386a9483a5f9b1a29c6dfd030.tar.bz2 drakx-backup-do-not-use-bad0205fe4ebd9c386a9483a5f9b1a29c6dfd030.tar.xz drakx-backup-do-not-use-bad0205fe4ebd9c386a9483a5f9b1a29c6dfd030.zip | |
remove weird newlines
Diffstat (limited to 'live/draklive-install')
| -rwxr-xr-x | live/draklive-install/draklive-install | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/live/draklive-install/draklive-install b/live/draklive-install/draklive-install index e6efeb54b..526a166b2 100755 --- a/live/draklive-install/draklive-install +++ b/live/draklive-install/draklive-install @@ -258,12 +258,10 @@ sub formatMountPartitions { fs::format::formatMount_all($o->{all_hds}, $o->{fstab}, $wait_message); } sub { $@ =~ /fsck failed on (\S+)/ or return; - $o->ask_yesorno('', N("Failed to check filesystem %s. Do you want to repair the errors? - (beware, you can lose data)", $1), 1); + $o->ask_yesorno('', N("Failed to check filesystem %s. Do you want to repair the errors? (beware, you can lose data)", $1), 1); }; undef $w; #- help perl (otherwise wait_message stays forever in newt) - die N("Not enough swap space to fulfill installation, please add some") if availableMemory( -) < 40 * 1024; + die N("Not enough swap space to fulfill installation, please add some") if availableMemory() < 40 * 1024; } #- install_any::guess_mount_point @@ -283,8 +281,7 @@ sub guess_mount_point { my $d = $handle->{dir}; my $mnt = find { -e "$d/$l{$_}" } keys %l; $mnt ||= (stat("$d/.bashrc"))[4] ? '/root' : '/home/user' . ++$$user if -e "$d/.bashrc"; - $mnt ||= (any { -d $_ && (stat($_))[4] >= 500 && -e "$_/.bashrc" } glob_($d)) ? '/home' : ' -'; + $mnt ||= (any { -d $_ && (stat($_))[4] >= 500 && -e "$_/.bashrc" } glob_($d)) ? '/home' : ''; ($mnt, $handle); } |