diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2005-04-11 10:07:38 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2005-04-11 10:07:38 +0000 |
| commit | d80af1f04c4a99849d8bcc61a337ea0a9dbe5683 (patch) | |
| tree | ef6eec79ace4a0ac393bb27b27efa91be270c5aa | |
| parent | b215d244d9277d97e2d924e2d4664488ad9c4fa7 (diff) | |
| download | drakx-backup-do-not-use-d80af1f04c4a99849d8bcc61a337ea0a9dbe5683.tar drakx-backup-do-not-use-d80af1f04c4a99849d8bcc61a337ea0a9dbe5683.tar.gz drakx-backup-do-not-use-d80af1f04c4a99849d8bcc61a337ea0a9dbe5683.tar.bz2 drakx-backup-do-not-use-d80af1f04c4a99849d8bcc61a337ea0a9dbe5683.tar.xz drakx-backup-do-not-use-d80af1f04c4a99849d8bcc61a337ea0a9dbe5683.zip | |
have a valid return value in ->ensure_is_installed_if_available
| -rw-r--r-- | perl-install/do_pkgs.pm | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/perl-install/do_pkgs.pm b/perl-install/do_pkgs.pm index 765c7717b..f8ed44028 100644 --- a/perl-install/do_pkgs.pm +++ b/perl-install/do_pkgs.pm @@ -41,8 +41,10 @@ sub ensure_binary_is_installed { sub ensure_is_installed_if_available { my ($do, $pkg, $file) = @_; - if (! -e "$::prefix$file" && !$::testing) { - $do->what_provides($pkg) and $do->install($pkg); + if (-e "$::prefix$file" || $::testing) { + 1; + } else { + $do->what_provides($pkg) && $do->install($pkg); } } |