From ee11c56d392c8d5cf4c3705b3ed57fd342da55dc Mon Sep 17 00:00:00 2001 From: Guillaume Cottenceau Date: Thu, 17 Apr 2003 12:46:29 +0000 Subject: - fix problem shown by #3768: correctly handle case when there are already update source(s), but they are all disabled --- rpmdrake | 10 ++++++++++ rpmdrake.spec | 6 +++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/rpmdrake b/rpmdrake index 96a4c396..4b5fbf83 100755 --- a/rpmdrake +++ b/rpmdrake @@ -792,6 +792,16 @@ Is it ok to continue?"), yesno => 1) or myexit(-1); update_sources($urpm, noclean => 1); } } else { + if (any { $_->{update} } @{$urpm->{media}}) { + interactive_msg_(N("Already existing update sources"), +N("You already have at least one update source configured, but +all of them are currently disabled. You should run the Software +Sources Manager to enable at least one (check it in the Enabled? +column). + +Then, restart MandrakeUpdate.", $update_name)); + myexit(-1); + } mu_retry_another_mirror: my $m = choose_mirror(); $m or interactive_msg_(N("How to choose manually your mirror"), diff --git a/rpmdrake.spec b/rpmdrake.spec index 12035611..0cab90ac 100644 --- a/rpmdrake.spec +++ b/rpmdrake.spec @@ -8,7 +8,7 @@ %define name rpmdrake %define version 2.1 -%define release 17mdk +%define release 18mdk Name: %{name} Version: %{version} @@ -116,6 +116,10 @@ rm -rf $RPM_BUILD_ROOT %{perl_vendorarch}/*.pm %changelog +* Thu Apr 17 2003 Guillaume Cottenceau 2.1-18mdk +- fix problem shown by #3768: correctly handle case when there + are already update source(s), but they are all disabled + * Wed Apr 16 2003 Guillaume Cottenceau 2.1-17mdk - fix drakhelp zombie process (thx titi) - More infos -> More info thx David Walser -- cgit v1.2.1