From 1e8bcb09e2b79cf140190c7970f66e28289c8f2b Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Tue, 13 Aug 2002 21:11:38 +0000
Subject: use ensure_is_installed

---
 perl-install/network/dav.pm    |  2 +-
 perl-install/network/nfs.pm    |  2 +-
 perl-install/network/smb.pm    |  2 +-
 perl-install/network/smbnfs.pm | 13 -------------
 4 files changed, 3 insertions(+), 16 deletions(-)

(limited to 'perl-install/network')

diff --git a/perl-install/network/dav.pm b/perl-install/network/dav.pm
index 3e5568f27..cde7e5101 100644
--- a/perl-install/network/dav.pm
+++ b/perl-install/network/dav.pm
@@ -7,5 +7,5 @@ use common;
 
 sub check {
     my ($class, $in) = @_;
-    $class->raw_check($in, 'davfs', '/sbin/mount.davfs');
+    $in->do_pkgs->ensure_is_installed('davfs', '/sbin/mount.davfs');
 }
diff --git a/perl-install/network/nfs.pm b/perl-install/network/nfs.pm
index 58b2dab28..e1a39aa7a 100644
--- a/perl-install/network/nfs.pm
+++ b/perl-install/network/nfs.pm
@@ -29,7 +29,7 @@ sub to_dev_raw {
 
 sub check {
     my ($class, $in) = @_;
-    $class->raw_check($in, 'nfs-utils-clients', '/usr/sbin/showmount');
+    $in->do_pkgs->ensure_is_installed('nfs-utils-clients', '/usr/sbin/showmount');
 }
 
 sub find_servers {
diff --git a/perl-install/network/smb.pm b/perl-install/network/smb.pm
index f59d43bd0..d1f2128bf 100644
--- a/perl-install/network/smb.pm
+++ b/perl-install/network/smb.pm
@@ -32,7 +32,7 @@ sub to_dev_raw {
 
 sub check {
     my ($class, $in) = @_;
-    $class->raw_check($in, 'samba-client', '/usr/bin/nmblookup');
+    $in->do_pkgs->ensure_is_installed('samba-client', '/usr/bin/nmblookup');
 }
 
 sub smbclient {
diff --git a/perl-install/network/smbnfs.pm b/perl-install/network/smbnfs.pm
index 6b55f6fd0..8bd29ea92 100644
--- a/perl-install/network/smbnfs.pm
+++ b/perl-install/network/smbnfs.pm
@@ -41,18 +41,5 @@ sub to_fstab_entry_raw {
     $fs_entry;
 }
 
-sub raw_check {
-    my ($class, $in, $pkg, $file) = @_;
-    if (! -e $file) {
-	$in->ask_okcancel('', _("The package %s needs to be installed. Do you want to install it?", $pkg), 1) or return;
-	$in->do_pkgs->install($pkg);
-    }
-    if (! -e $file) {
-	$in->ask_warn('', _("Mandatory package %s is missing", $pkg));
-	return;
-    }
-    1;
-}
-
 1;
 
-- 
cgit v1.2.1