aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Cottenceau <gc@mandriva.com>2003-04-16 15:25:32 +0000
committerGuillaume Cottenceau <gc@mandriva.com>2003-04-16 15:25:32 +0000
commitb67034435d532bcdd1a057ce1ae7dc1e09898696 (patch)
tree12ecdb762c10e75d1e1799b690755ecf3c9a9f46
parent750482325690397d1cb90e42dc7bd1923b5fd5e1 (diff)
downloadrpmdrake-b67034435d532bcdd1a057ce1ae7dc1e09898696.tar
rpmdrake-b67034435d532bcdd1a057ce1ae7dc1e09898696.tar.gz
rpmdrake-b67034435d532bcdd1a057ce1ae7dc1e09898696.tar.bz2
rpmdrake-b67034435d532bcdd1a057ce1ae7dc1e09898696.tar.xz
rpmdrake-b67034435d532bcdd1a057ce1ae7dc1e09898696.zip
- show download progress of update medias when starting
MandrakeUpdate
-rwxr-xr-xrpmdrake7
-rw-r--r--rpmdrake.spec2
2 files changed, 4 insertions, 5 deletions
diff --git a/rpmdrake b/rpmdrake
index a20330c8..d2e26e82 100755
--- a/rpmdrake
+++ b/rpmdrake
@@ -781,7 +781,6 @@ sub get_installable_pkgs {
$urpm->configure();
my $statedir = $urpm->{statedir};
@update_medias = grep { !$_->{ignore} && $_->{update} } @{$urpm->{media}};
- undef $urpm;
if (@update_medias > 0) {
if (!$opts->{skip_updating_mu}) {
$options{'no-confirmation'} or interactive_msg_('rpmdrake',
@@ -789,10 +788,8 @@ N("I need to contact the mirror to get latest update packages.
Please check that your network is currently running.
Is it ok to continue?"), yesno => 1) or myexit(-1);
- slow_func(N("Please wait, contacting mirror to update packages information."),
- sub { system('/usr/sbin/urpmi.update', map { $_->{name} } @update_medias) == 0
- or fatal_msg(N("Error updating medium"),
- N("There was an unrecoverable error while updating packages information.")) });
+ $urpm->select_media(map { $_->{name} } @update_medias);
+ update_sources($urpm, noclean => 1);
}
} else {
mu_retry_another_mirror:
diff --git a/rpmdrake.spec b/rpmdrake.spec
index 3db0422c..12035611 100644
--- a/rpmdrake.spec
+++ b/rpmdrake.spec
@@ -123,6 +123,8 @@ rm -rf $RPM_BUILD_ROOT
in -16mdk, when trying to select a package that conflicts with
a previously selected
- add urpmi reasons when "sorry this package can't be selected"
+- show download progress of update medias when starting
+ MandrakeUpdate
* Tue Apr 15 2003 Guillaume Cottenceau <gc@mandrakesoft.com> 2.1-16mdk
- update for urpmi-4.3 (skipped packages should be better handled