diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2004-02-12 20:20:40 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2004-02-12 20:20:40 +0000 |
| commit | 0619a67bed971c9c23bf0d0afe19af33b716dee6 (patch) | |
| tree | 1cb9dd96b16b5a06ba03c06f5f106cfc4cf02542 | |
| parent | e032ba25121bbb91635ba25d1ca0d9d3d2b7f2f3 (diff) | |
| download | drakx-backup-do-not-use-0619a67bed971c9c23bf0d0afe19af33b716dee6.tar drakx-backup-do-not-use-0619a67bed971c9c23bf0d0afe19af33b716dee6.tar.gz drakx-backup-do-not-use-0619a67bed971c9c23bf0d0afe19af33b716dee6.tar.bz2 drakx-backup-do-not-use-0619a67bed971c9c23bf0d0afe19af33b716dee6.tar.xz drakx-backup-do-not-use-0619a67bed971c9c23bf0d0afe19af33b716dee6.zip | |
handle case where rpm can't be found (eg: XFree86-SVGA for xfree3) (part of bugzilla #7786)
| -rw-r--r-- | perl-install/Xconfig/card.pm | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/perl-install/Xconfig/card.pm b/perl-install/Xconfig/card.pm index 9496c9777..a483365d4 100644 --- a/perl-install/Xconfig/card.pm +++ b/perl-install/Xconfig/card.pm @@ -298,6 +298,7 @@ sub configure { } } if (!$auto) { + card_config__not_listed: card_config__not_listed($in, $cards[0], $options) or return; } @@ -305,7 +306,12 @@ sub configure { xfree_and_glx_choose($in, $card, $auto) or return; - $card->{prog} = install_server($card, $options, $do_pkgs); + eval { + $card->{prog} = install_server($card, $options, $do_pkgs); + } or do { + $in->ask_warn('', N("Can't install XFree package: %s", $@)); + goto card_config__not_listed; + }; if ($card->{needVideoRam} && !$card->{VideoRam}) { if ($auto) { |