aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoão Victor Duarte Martins <jvdm@mandriva.com.br>2011-08-12 18:29:16 +0000
committerJoão Victor Duarte Martins <jvdm@mandriva.com.br>2011-08-12 18:29:16 +0000
commitcf2613225d7d494e4f970e6c941d0bb0595133f9 (patch)
tree1a803663251ee17b78ed3d903dce431e870bd602
parenta7dc414b1dba891835444fba51c67a1edeb72069 (diff)
downloadrpmdrake-cf2613225d7d494e4f970e6c941d0bb0595133f9.tar
rpmdrake-cf2613225d7d494e4f970e6c941d0bb0595133f9.tar.gz
rpmdrake-cf2613225d7d494e4f970e6c941d0bb0595133f9.tar.bz2
rpmdrake-cf2613225d7d494e4f970e6c941d0bb0595133f9.tar.xz
rpmdrake-cf2613225d7d494e4f970e6c941d0bb0595133f9.zip
Merge from trunk up to r273200distro/mdv2011
-rw-r--r--Makefile2
-rw-r--r--NEWS5
-rw-r--r--Rpmdrake/formatting.pm5
-rw-r--r--Rpmdrake/gui.pm5
4 files changed, 7 insertions, 10 deletions
diff --git a/Makefile b/Makefile
index 10fd5e9f..5fd9b287 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-VERSION = 5.26.10
+VERSION = 5.26.11
NAME = rpmdrake
DIRS = grpmi po data mime
diff --git a/NEWS b/NEWS
index 1fa8dac4..20cbc66a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,8 @@
+Version 5.26.11 - 12 August 2011, by J. Victor Martins
+
+- Return URPM::Package->fullname in urpm_name (fix #63445, #63222)
+- Revert parsing to NVRA after urpm::select::find_packages_to_remove
+
Version 5.26.10 - 10 August 2011, by J. Victor Martins
- Add parsing of removed fullnames to NVRA after
diff --git a/Rpmdrake/formatting.pm b/Rpmdrake/formatting.pm
index b60b01e1..6b2ad3ad 100644
--- a/Rpmdrake/formatting.pm
+++ b/Rpmdrake/formatting.pm
@@ -91,10 +91,7 @@ sub my_fullname {
sub urpm_name {
return '?-?-?.?' unless ref $_[0];
- my @fullname = $_[0]->fullname;
- my ($name, $version, $release) = @fullname;
- my $arch = @fullname[-1];
- "$name-$version-$release.$arch";
+ return scalar $_[0]->fullname;
}
diff --git a/Rpmdrake/gui.pm b/Rpmdrake/gui.pm
index 6d4398e9..2ab9c032 100644
--- a/Rpmdrake/gui.pm
+++ b/Rpmdrake/gui.pm
@@ -679,11 +679,6 @@ sub pkgs_provider {
sub closure_removal {
local $urpm->{state} = {};
urpm::select::find_packages_to_remove($urpm, $urpm->{state}, \@_);
- my $rejected = $urpm->{state}{rejected};
- return map {
- sprintf("%s-%s-%s.%s",
- URPM::fullname_parts($rejected->{$_}, $_))
- } urpm::select::removed_packages(undef, $urpm->{state});
}
sub is_locale_available {