Mageia Bugzilla – Attachment 5161 Details for
Bug 12766
Existence of backports packages causes problems in rpmdrake
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
New Account
|
Forgot Password
[patch]
patch that solves the problem
backports.patch (text/plain), 3.13 KB, created by
Angelo Naselli
on 2014-05-15 16:31:37 CEST
(
hide
)
Description:
patch that solves the problem
Filename:
MIME Type:
Creator:
Angelo Naselli
Created:
2014-05-15 16:31:37 CEST
Size:
3.13 KB
patch
obsolete
>diff --git a/Rpmdrake/gui.pm b/Rpmdrake/gui.pm >index 2972477..2ecdc21 100644 >--- a/Rpmdrake/gui.pm >+++ b/Rpmdrake/gui.pm >@@ -647,9 +647,12 @@ sub pkgs_provider { > installed => $h->{installed}, > all => [ keys %$pkgs ], > ); >+ #anaselli NOTE $all_pkgs contains only latest updates, not all of them. >+ # Moreover only if backports are enabled those are offered, >+ # so non needs to remove inactive_backports from all packages > my %tmp_filter_methods = ( > all => sub { >- [ difference2([ keys %$pkgs ], $h->{inactive_backports}) ]; >+ [ keys %$pkgs ]; > }, > all_updates => sub { > # potential "updates" from media not tagged as updates: >diff --git a/Rpmdrake/pkg.pm b/Rpmdrake/pkg.pm >index e9229b8..72d6bfa 100644 >--- a/Rpmdrake/pkg.pm >+++ b/Rpmdrake/pkg.pm >@@ -518,21 +518,18 @@ sub get_pkgs { > $urpm->{rpmdrake_state} = $state; #- Don't forget it > $gurpm->progress($level = 0.7); > >+ #anaselli NOTE $all_pkgs contains only latest updates, not all of them >+ # but that has some issues on backports, and the old management, >+ # such as filters for instance, let's set backport first then, and >+ # only if they are enabled > my %l; > reset_pbar_count(1); >- foreach my $pkg (@{$urpm->{depslist}}) { >- update_pbar($gurpm); >- $pkg->flag_upgrade or next; >- my $key = $pkg->name . $pkg->arch; >- $l{$key} = $pkg if !$l{$key} || $l{$key}->compare($pkg); >- } >- my @installable_pkgs = map { my $n = $_->fullname; $all_pkgs{$n} = { pkg => $_ }; $n } values %l; >- undef %l; >- > my @inactive_backports; > my @active_backports; > my @backport_medias = get_backport_media($urpm); > >+ my @depslist = @{$urpm->{depslist}}; >+ my $removed = 0; > foreach my $medium (@backport_medias) { > update_pbar($gurpm); > >@@ -549,9 +546,30 @@ sub get_pkgs { > $pkg->flag_upgrade or next; > my $name = $pkg->fullname; > push @$backports, $name; >- $all_pkgs{$name} = { pkg => $pkg, is_backport => 1 }; >+ if (!$medium->{searchmedia}) { >+ # active_backports >+ my $key = $pkg->name . $pkg->arch; >+ if (!$l{$key} || ($l{$key}->fullname lt $pkg->fullname)) { >+ $l{$key} = $pkg ; >+ #anaselli letting the is_backport_flag >+ $all_pkgs{$name} = { pkg => $pkg, is_backport => 1 }; >+ } >+ } >+ # removing from list so that only updates will be added later >+ splice @depslist, $pkg_id-$removed, 1; >+ $removed++; > } > } >+ foreach my $pkg (@depslist) { >+ update_pbar($gurpm); >+ $pkg->flag_upgrade or next; >+ my $key = $pkg->name . $pkg->arch; >+ my $name = $pkg->fullname; >+ $l{$key} = $pkg if !$l{$key} || ($l{$key}->fullname lt $pkg->fullname); >+ } >+ my @installable_pkgs = map { my $n = $_->fullname; $all_pkgs{$n} = { pkg => $_ }; $n } values %l; >+ undef %l; >+ > my @updates = @requested; > # selecting updates by default but skipped ones (MageiaUpdate only): > foreach (@requested_strict) {
diff --git a/Rpmdrake/gui.pm b/Rpmdrake/gui.pm index 2972477..2ecdc21 100644 --- a/Rpmdrake/gui.pm +++ b/Rpmdrake/gui.pm @@ -647,9 +647,12 @@ sub pkgs_provider { installed => $h->{installed}, all => [ keys %$pkgs ], ); + #anaselli NOTE $all_pkgs contains only latest updates, not all of them. + # Moreover only if backports are enabled those are offered, + # so non needs to remove inactive_backports from all packages my %tmp_filter_methods = ( all => sub { - [ difference2([ keys %$pkgs ], $h->{inactive_backports}) ]; + [ keys %$pkgs ]; }, all_updates => sub { # potential "updates" from media not tagged as updates: diff --git a/Rpmdrake/pkg.pm b/Rpmdrake/pkg.pm index e9229b8..72d6bfa 100644 --- a/Rpmdrake/pkg.pm +++ b/Rpmdrake/pkg.pm @@ -518,21 +518,18 @@ sub get_pkgs { $urpm->{rpmdrake_state} = $state; #- Don't forget it $gurpm->progress($level = 0.7); + #anaselli NOTE $all_pkgs contains only latest updates, not all of them + # but that has some issues on backports, and the old management, + # such as filters for instance, let's set backport first then, and + # only if they are enabled my %l; reset_pbar_count(1); - foreach my $pkg (@{$urpm->{depslist}}) { - update_pbar($gurpm); - $pkg->flag_upgrade or next; - my $key = $pkg->name . $pkg->arch; - $l{$key} = $pkg if !$l{$key} || $l{$key}->compare($pkg); - } - my @installable_pkgs = map { my $n = $_->fullname; $all_pkgs{$n} = { pkg => $_ }; $n } values %l; - undef %l; - my @inactive_backports; my @active_backports; my @backport_medias = get_backport_media($urpm); + my @depslist = @{$urpm->{depslist}}; + my $removed = 0; foreach my $medium (@backport_medias) { update_pbar($gurpm); @@ -549,9 +546,30 @@ sub get_pkgs { $pkg->flag_upgrade or next; my $name = $pkg->fullname; push @$backports, $name; - $all_pkgs{$name} = { pkg => $pkg, is_backport => 1 }; + if (!$medium->{searchmedia}) { + # active_backports + my $key = $pkg->name . $pkg->arch; + if (!$l{$key} || ($l{$key}->fullname lt $pkg->fullname)) { + $l{$key} = $pkg ; + #anaselli letting the is_backport_flag + $all_pkgs{$name} = { pkg => $pkg, is_backport => 1 }; + } + } + # removing from list so that only updates will be added later + splice @depslist, $pkg_id-$removed, 1; + $removed++; } } + foreach my $pkg (@depslist) { + update_pbar($gurpm); + $pkg->flag_upgrade or next; + my $key = $pkg->name . $pkg->arch; + my $name = $pkg->fullname; + $l{$key} = $pkg if !$l{$key} || ($l{$key}->fullname lt $pkg->fullname); + } + my @installable_pkgs = map { my $n = $_->fullname; $all_pkgs{$n} = { pkg => $_ }; $n } values %l; + undef %l; + my @updates = @requested; # selecting updates by default but skipped ones (MageiaUpdate only): foreach (@requested_strict) {
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 12766
:
5158
|
5160
| 5161 |
5166
|
5185
|
5186
|
5187
|
5216
|
5217