aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2008-02-11 16:31:33 +0000
committerThierry Vignaud <tv@mandriva.org>2008-02-11 16:31:33 +0000
commit5873009da9806d5221e83359740bfe043a8eb1cf (patch)
tree78d7ceaf06ec9235ed1927d20c97202e5ebe7b80
parent09d0c7ef3ebf7b66218eef1f9d0fb29a39578d64 (diff)
downloadrpmdrake-5873009da9806d5221e83359740bfe043a8eb1cf.tar
rpmdrake-5873009da9806d5221e83359740bfe043a8eb1cf.tar.gz
rpmdrake-5873009da9806d5221e83359740bfe043a8eb1cf.tar.bz2
rpmdrake-5873009da9806d5221e83359740bfe043a8eb1cf.tar.xz
rpmdrake-5873009da9806d5221e83359740bfe043a8eb1cf.zip
reindent
-rwxr-xr-xrpmdrake22
1 files changed, 13 insertions, 9 deletions
diff --git a/rpmdrake b/rpmdrake
index e2e13b20..4dd56a7a 100755
--- a/rpmdrake
+++ b/rpmdrake
@@ -110,17 +110,21 @@ sub do_search($$$$$$$) {
$searchstop and last;
my $gurpm; # per medium download progress bar (if needed)
my $_gurpm_clean_guard = before_leaving { undef $gurpm };
- my $xml_info_file = urpm::media::any_xml_info($urpm, $medium,
- ($current_search_type eq 'files' ? 'files' : 'info'),
- undef, sub {
- $gurpm ||= Rpmdrake::gurpm->new(N("Please wait"), transient => $::main_window);
- download_callback($gurpm, @_) or do {
- $searchstop = 1;
- };
- }) or do {
+ my $xml_info_file =
+ urpm::media::any_xml_info($urpm, $medium,
+ ($current_search_type eq 'files' ? 'files' : 'info'),
+ undef,
+ sub {
+ $gurpm ||= Rpmdrake::gurpm->new(N("Please wait"),
+ transient => $::main_window);
+ download_callback($gurpm, @_) or do {
+ $searchstop = 1;
+ };
+ });
+ if (!$xml_info_file) {
$urpm->{error}(N("no xml-info available for medium \"%s\"", $medium->{name}));
next;
- };
+ }
$searchstop and last;
require urpm::xml_info;