diff options
| -rw-r--r-- | URPM/Resolve.pm | 19 | ||||
| -rw-r--r-- | perl-URPM.spec | 5 |
2 files changed, 18 insertions, 6 deletions
diff --git a/URPM/Resolve.pm b/URPM/Resolve.pm index 8247489..4bafa2a 100644 --- a/URPM/Resolve.pm +++ b/URPM/Resolve.pm @@ -571,7 +571,8 @@ sub request_packages_to_upgrade { if (my ($pn, $pevr) = /^([^\s\[]*)(?:\[\*\])?\[?=+\s*([^\s\]]*)/) { $pn eq $n or next; if (ranges_overlap("< $evr", "== $pevr")) { - $skip{$provides{$n}->name} = undef; #- this package looks like too old ? + #- this package looks like too old ? + $provides{$n}->name ne $pkg->name and $skip{$provides{$n}->name} = undef; $provides{$n} = $pkg; } last; @@ -621,11 +622,15 @@ sub request_packages_to_upgrade { if (my $pkg = $names{$p->name}) { unless ($pkg->flag_upgrade || $pkg->flag_installed) { $pkg->set_flag_installed; #- there is at least one package installed (whatever its version). - $pkg->flag_upgrade and $pkg->set_flag_upgrade($pkg->compare_pkg($p) > 0); + $pkg->set_flag_upgrade; } - $pkg->flag_upgrade or delete $names{$p->name}; + $pkg->flag_upgrade and $pkg->set_flag_upgrade($pkg->compare_pkg($p) > 0); #- keep in mind the package is requested. - $pkg->flag_upgrade and $requested{$p->name} = undef; + if ($pkg->flag_upgrade) { + $requested{$p->name} = undef; + } else { + delete $names{$p->name}; + } } #- check provides of existing package to see if a obsolete @@ -663,7 +668,11 @@ sub request_packages_to_upgrade { $pkg->flag_upgrade and $pkg->set_flag_upgrade($pkg->compare_pkg($p) > 0); }); } - $pkg->flag_installed && !$pkg->flag_upgrade and delete $names{$pkg->name}; + if ($pkg->flag_installed && !$pkg->flag_upgrade) { + delete $names{$pkg->name}; + } else { + $requested{$pkg->name} = undef; + } } #- examine all packages which may be conflicting, it a package conflicts, it should not be requested. diff --git a/perl-URPM.spec b/perl-URPM.spec index 3d62599..2ed806e 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 7mdk +%define release 8mdk %{expand:%%define rpm_version %(rpm -q --queryformat '%{VERSION}-%{RELEASE}' rpm)} @@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Aug 13 2002 François Pons <fpons@mandrakesoft.com> 0.60-8mdk +- fixed request_packages_to_upgrade no more working correctly. + * Mon Aug 12 2002 François Pons <fpons@mandrakesoft.com> 0.60-7mdk - fixed bad behaviour of request_packages_to_upgrade if upgrade flag has been computed before. |