diff options
author | Olivier Blin <oblin@mandriva.com> | 2007-09-28 20:39:45 +0000 |
---|---|---|
committer | Olivier Blin <oblin@mandriva.com> | 2007-09-28 20:39:45 +0000 |
commit | 784f718e4f1d63f05217259fd39c073f89ce0639 (patch) | |
tree | 0b9b0e79f34a360ffc9fa1ad5844df871982efee | |
parent | 26db8a91cce6931d9501c60b0d62b4a2787713f8 (diff) | |
download | draklive-install-784f718e4f1d63f05217259fd39c073f89ce0639.tar draklive-install-784f718e4f1d63f05217259fd39c073f89ce0639.tar.gz draklive-install-784f718e4f1d63f05217259fd39c073f89ce0639.tar.bz2 draklive-install-784f718e4f1d63f05217259fd39c073f89ce0639.tar.xz draklive-install-784f718e4f1d63f05217259fd39c073f89ce0639.zip |
use new pop_wait_messages option from interactive::gtk not to use hack that does not work anymore (made the installer crash)
-rwxr-xr-x | draklive-install | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/draklive-install b/draklive-install index ca31ed9..ef6ba61 100755 --- a/draklive-install +++ b/draklive-install @@ -51,6 +51,7 @@ sub on_reboot_needed() { } my $in = 'interactive'->vnew('su'); +$in->{pop_wait_messages} = 0; $::prefix = '/mnt/install'; my $all_hds = {}; my $fstab = []; @@ -89,10 +90,7 @@ umount_all($fstab); fs::partitioning::format_mount_partitions($in, $all_hds, $fstab); #- copy to disk -my $wait = do { - local $::isInstall = 1; # quick hack to embed the wait message - $in->wait_message('', N("Computing total size")); -}; +my $wait = $in->wait_message('', N("Computing total size")); my $total = first(split(/\s+/, `du -sbx / 2>/dev/null`)); undef $wait; @@ -105,10 +103,7 @@ sub build_copy_command { ); } -($wait, my $update_progress) = do { - local $::isInstall = 1; # quick hack to embed the wait message; - copying_message_with_progress_bar($in, N("Copying in progress")); -}; +($wait, my $update_progress) = copying_message_with_progress_bar($in, N("Copying in progress")); open(my $OUTPUT, '-|', build_copy_command('/', $::prefix)); { local $_; |