summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2002-08-13 21:11:38 +0000
committerPascal Rigaux <pixel@mandriva.com>2002-08-13 21:11:38 +0000
commit1e8bcb09e2b79cf140190c7970f66e28289c8f2b (patch)
tree9c77a93f37167e69412ba6e2a104d91c545b0bb0
parent26f4283dcfbdcb5305c3e7181c6ae82284d47c02 (diff)
downloaddrakx-backup-do-not-use-1e8bcb09e2b79cf140190c7970f66e28289c8f2b.tar
drakx-backup-do-not-use-1e8bcb09e2b79cf140190c7970f66e28289c8f2b.tar.gz
drakx-backup-do-not-use-1e8bcb09e2b79cf140190c7970f66e28289c8f2b.tar.bz2
drakx-backup-do-not-use-1e8bcb09e2b79cf140190c7970f66e28289c8f2b.tar.xz
drakx-backup-do-not-use-1e8bcb09e2b79cf140190c7970f66e28289c8f2b.zip
use ensure_is_installed
-rw-r--r--perl-install/network/dav.pm2
-rw-r--r--perl-install/network/nfs.pm2
-rw-r--r--perl-install/network/smb.pm2
-rw-r--r--perl-install/network/smbnfs.pm13
4 files changed, 3 insertions, 16 deletions
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;