diff options
| author | Antoine Ginies <aginies@mandriva.com> | 2004-03-25 11:39:04 +0000 |
|---|---|---|
| committer | Antoine Ginies <aginies@mandriva.com> | 2004-03-25 11:39:04 +0000 |
| commit | 655c7b1953a9288c3a02773208a2e1896a2d7c44 (patch) | |
| tree | f76a8b8db9775a1f4bcb70341f09903015c59140 | |
| parent | c06cfc889f1d125e3f6e07db553c91b0a515e1fc (diff) | |
| download | drakwizard-655c7b1953a9288c3a02773208a2e1896a2d7c44.tar drakwizard-655c7b1953a9288c3a02773208a2e1896a2d7c44.tar.gz drakwizard-655c7b1953a9288c3a02773208a2e1896a2d7c44.tar.bz2 drakwizard-655c7b1953a9288c3a02773208a2e1896a2d7c44.tar.xz drakwizard-655c7b1953a9288c3a02773208a2e1896a2d7c44.zip | |
rename check_rpm to check_rpm_local (misc)
| -rwxr-xr-x | drakwizard.pl | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drakwizard.pl b/drakwizard.pl index 6036a475..b8ce3f29 100755 --- a/drakwizard.pl +++ b/drakwizard.pl @@ -84,7 +84,7 @@ sub wizard { if ($> && !$o->{allow_user} && !$::testing) { require_root_capability(); } - check_rpm($o->{needed_rpm}) if $o->{needed_rpm}; + check_rpm_local($o->{needed_rpm}) if $o->{needed_rpm}; if (defined $o->{init}) { my ($res, $msg) = &{$o->{init}}; if (!$res) { @@ -134,7 +134,8 @@ sub wizard { } } -sub check_rpm { +## fix duplicate check_rpm with /usr/lib/libDrakX/wizards.pm +sub check_rpm_local { my ($rpms) = @_; foreach my $rpm (@$rpms) { if (!$in->do_pkgs->is_installed($rpm)) { |