diff options
| -rwxr-xr-x | edit-urpm-sources.pl | 13 | ||||
| -rw-r--r-- | rpmdrake.pm | 1 |
2 files changed, 8 insertions, 6 deletions
diff --git a/edit-urpm-sources.pl b/edit-urpm-sources.pl index 49532029..879f01b4 100755 --- a/edit-urpm-sources.pl +++ b/edit-urpm-sources.pl @@ -897,11 +897,7 @@ sub mainwindow { interactive_msg('rpmdrake', N("This medium needs to be updated to be usable. Update it now ?"), yesno => 1, - ) and do { - my $wait = wait_msg(N("Please wait, updating medium \"%s\"...", $urpm->{media}[$path]{name})); - $reread_media->($urpm->{media}[$path]{name}); - remove_wait_msg($wait); - } + ) and $reread_media->($urpm->{media}[$path]{name}); } }, ); @@ -967,7 +963,12 @@ sub mainwindow { delete $_->{ignore}; } $urpm->select_media($name); - $urpm->update_media(noclean => 1, nolock => 1); + update_sources_check( + $urpm, + { nolock => 1 }, + N_("Unable to update medium, errors reported:\n\n%s"), + $name, + ); } $list->clear; $list->append_set(0 => !$_->{ignore}, 1 => ! !$_->{update}, 2 => $_->{name}) foreach grep { ! $_->{external} } @{$urpm->{media}}; diff --git a/rpmdrake.pm b/rpmdrake.pm index 11dc6af7..20805169 100644 --- a/rpmdrake.pm +++ b/rpmdrake.pm @@ -73,6 +73,7 @@ our @EXPORT = qw( make_url_mirror_dist show_urpm_progress update_sources + update_sources_check update_sources_interactive add_medium_and_check check_update_media_version |