From fe972aaf9ac7a74ec204d5f4ba7f80dd0ab0901e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20Lefebvre?= <alefebvre@mandriva.com>
Date: Mon, 17 Aug 2009 12:56:29 +0000
Subject: - diskdrake : added the ability to exit the davfs2 mountpoint
 settings panel

---
 perl-install/NEWS             | 1 +
 perl-install/diskdrake/dav.pm | 8 ++++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/NEWS b/perl-install/NEWS
index 07fdfe45d..de13db4ce 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -4,6 +4,7 @@
   o when user does not specify user/pass with davfs2, fallback to nobody/nobody
   o Fix a crash with regexp when a /etc/davfs2/secrets line is 
     finished with one or more blank characters without comments
+  o added the ability to exit the davfs2 mountpoint settings panel
 - adduserdrake
   o now use password weakness display
 - added password weakness display feature in interactive
diff --git a/perl-install/diskdrake/dav.pm b/perl-install/diskdrake/dav.pm
index 4950b2bb0..e671a3ea2 100644
--- a/perl-install/diskdrake/dav.pm
+++ b/perl-install/diskdrake/dav.pm
@@ -37,6 +37,7 @@ sub create {
     ask_server($in, $dav, $all_hds) or return;
     push @{$all_hds->{davs}}, $dav;
     config($in, $dav, $all_hds);
+    return;
 }
 
 sub config {
@@ -45,11 +46,12 @@ sub config {
     my $dav = { %$dav_ }; #- working on a local copy so that "Cancel" works
 
     my $action;
-    while ($action ne 'Done') {
+    my $exit;
+    while (!$exit && $action ne 'Done') {
 	my %actions = my @actions = actions($dav);
 	$action = $in->ask_from_list_('', format_dav_info($dav), 
 					 [ map { $_->[0] } group_by2 @actions ], 'Done') or return;
-	$actions{$action}->($in, $dav, $all_hds);    
+	$exit = $actions{$action}->($in, $dav, $all_hds);    
     }
     %$dav_ = %$dav; #- applying
 }
@@ -95,11 +97,13 @@ sub ask_server {
 sub options {
     my ($in, $dav, $all_hds) = @_;
     diskdrake::interactive::Options($in, {}, $dav, $all_hds);
+    return;
 }
 sub mount_point { 
     my ($in, $dav, $all_hds) = @_;
     my $proposition = $dav->{device} =~ /(\w+)/ ? "/mnt/$1" : "/mnt/dav";
     diskdrake::interactive::Mount_point_raw_hd($in, $dav, $all_hds, $proposition);
+    return;
 }
 
 sub format_dav_info {
-- 
cgit v1.2.1