Mageia Bugzilla – Attachment 5158 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 to partially fix the problem
backports.patch (text/plain), 1.72 KB, created by
Angelo Naselli
on 2014-05-14 22:13:03 CEST
(
hide
)
Description:
patch to partially fix the problem
Filename:
MIME Type:
Creator:
Angelo Naselli
Created:
2014-05-14 22:13:03 CEST
Size:
1.72 KB
patch
obsolete
>diff --git a/Rpmdrake/pkg.pm b/Rpmdrake/pkg.pm >index e9229b8..1ddd030 100644 >--- a/Rpmdrake/pkg.pm >+++ b/Rpmdrake/pkg.pm >@@ -520,15 +520,6 @@ sub get_pkgs { > > 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); >@@ -542,16 +533,28 @@ sub get_pkgs { > > my $backports = > $medium->{searchmedia} ? \@inactive_backports : \@active_backports; >- > foreach my $pkg_id ($medium->{start} .. $medium->{end}) { > next if !$pkg_id; > my $pkg = $urpm->{depslist}[$pkg_id]; > $pkg->flag_upgrade or next; > my $name = $pkg->fullname; >+ > push @$backports, $name; >- $all_pkgs{$name} = { pkg => $pkg, is_backport => 1 }; >+ if (!$medium->{searchmedia}) { >+ $all_pkgs{$name} = { pkg => $pkg, is_backport => 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} || member($pkg->fullname, @inactive_backports) && $l{$key}->compare($pkg); >+ } >+ 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/pkg.pm b/Rpmdrake/pkg.pm index e9229b8..1ddd030 100644 --- a/Rpmdrake/pkg.pm +++ b/Rpmdrake/pkg.pm @@ -520,15 +520,6 @@ sub get_pkgs { 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); @@ -542,16 +533,28 @@ sub get_pkgs { my $backports = $medium->{searchmedia} ? \@inactive_backports : \@active_backports; - foreach my $pkg_id ($medium->{start} .. $medium->{end}) { next if !$pkg_id; my $pkg = $urpm->{depslist}[$pkg_id]; $pkg->flag_upgrade or next; my $name = $pkg->fullname; + push @$backports, $name; - $all_pkgs{$name} = { pkg => $pkg, is_backport => 1 }; + if (!$medium->{searchmedia}) { + $all_pkgs{$name} = { pkg => $pkg, is_backport => 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} || member($pkg->fullname, @inactive_backports) && $l{$key}->compare($pkg); + } + 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