diff options
| author | Francois Pons <fpons@mandriva.com> | 2002-08-09 17:12:44 +0000 |
|---|---|---|
| committer | Francois Pons <fpons@mandriva.com> | 2002-08-09 17:12:44 +0000 |
| commit | 4a2697eb846739d81ae19d66afe908fdad246fbc (patch) | |
| tree | a2ed8c7cd3cc4de6e5aa327879265cd37254f3d2 | |
| parent | 2c70532f3f7466c2db2294690407df1fdd781e5b (diff) | |
| download | perl-URPM-4a2697eb846739d81ae19d66afe908fdad246fbc.tar perl-URPM-4a2697eb846739d81ae19d66afe908fdad246fbc.tar.gz perl-URPM-4a2697eb846739d81ae19d66afe908fdad246fbc.tar.bz2 perl-URPM-4a2697eb846739d81ae19d66afe908fdad246fbc.tar.xz perl-URPM-4a2697eb846739d81ae19d66afe908fdad246fbc.zip | |
0.60-5mdk
| -rw-r--r-- | URPM/Resolve.pm | 4 | ||||
| -rw-r--r-- | perl-URPM.spec | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/URPM/Resolve.pm b/URPM/Resolve.pm index 4f4207e..fdac138 100644 --- a/URPM/Resolve.pm +++ b/URPM/Resolve.pm @@ -649,11 +649,11 @@ sub request_packages_to_upgrade { } #- examine all packages which may be conflicting, it a package conflicts, it should not be requested. - my @names = keys %names; + my @names = map { $_->name." == ".$_->epoch.":".$_->version."-".$_->release } values %names; my @pkgs = values %names; foreach my $pkg (@pkgs) { foreach my $conflict ($pkg->conflicts) { - delete @names{grep { ranges_overlap($conflict, $_) } @names}; + delete @names{map { /(\S*)/ && $1 } grep { ranges_overlap($conflict, $_) } @names}; } } diff --git a/perl-URPM.spec b/perl-URPM.spec index 479f5e9..1426c38 100644 --- a/perl-URPM.spec +++ b/perl-URPM.spec @@ -1,7 +1,7 @@ %define name perl-URPM %define real_name URPM %define version 0.60 -%define release 4mdk +%define release 5mdk %{expand:%%define rpm_version %(rpm -q --queryformat '%{VERSION}-%{RELEASE}' rpm)} @@ -48,6 +48,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Aug 9 2002 François Pons <fpons@mandrakesoft.com> 0.60-5mdk +- fixed package not selected to be upgraded (--auto-select of + urpmi) when there are sense conflicts (initscripts). + * Fri Aug 9 2002 François Pons <fpons@mandrakesoft.com> 0.60-4mdk - compute_installed_flags returns size of package present. - fixed too large ask_remove closure due to missing provides of |