aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Cottenceau <gc@mandriva.com>2003-08-07 11:49:39 +0000
committerGuillaume Cottenceau <gc@mandriva.com>2003-08-07 11:49:39 +0000
commitb084a03928c68929eae319b5950f111c0b5cb68c (patch)
treeb7880f22be257024ba67bbe4ccb90903f9aa5acc
parentbaf60c29398da87c690b784023cacb368056ef40 (diff)
downloadrpmdrake-b084a03928c68929eae319b5950f111c0b5cb68c.tar
rpmdrake-b084a03928c68929eae319b5950f111c0b5cb68c.tar.gz
rpmdrake-b084a03928c68929eae319b5950f111c0b5cb68c.tar.bz2
rpmdrake-b084a03928c68929eae319b5950f111c0b5cb68c.tar.xz
rpmdrake-b084a03928c68929eae319b5950f111c0b5cb68c.zip
message about signatures problems:
- when there are more than 10 packages with signatures problems, pass the "scroll" option - basename the packages - sort the packages
-rwxr-xr-xrpmdrake4
-rw-r--r--rpmdrake.spec2
2 files changed, 4 insertions, 2 deletions
diff --git a/rpmdrake b/rpmdrake
index f355fc48..0157418f 100755
--- a/rpmdrake
+++ b/rpmdrake
@@ -1105,13 +1105,13 @@ sub perform_installation { #- (partially) duplicated from /usr/sbin/urpmi :-(
my $progress;
my @invalid_sources;
foreach (@rpms_install, @rpms_upgrade) {
- URPM::verify_rpm($_) =~ /NOT OK/ and push @invalid_sources, $_;
+ URPM::verify_rpm($_) =~ /NOT OK/ and push @invalid_sources, basename($_);
gurpm::progress(++$progress/$total);
}
if (@invalid_sources) {
interactive_msg_('rpmdrake',
N("The following packages have bad signatures:\n\n%s\n\nDo you want to continue installation?",
- join "\n", @invalid_sources), yesno => 1) or goto return_with_error;
+ join "\n", sort @invalid_sources), yesno => 1, if_(@invalid_sources > 10, scroll => 1)) or goto return_with_error;
}
}
diff --git a/rpmdrake.spec b/rpmdrake.spec
index 6959fdd9..6e8be481 100644
--- a/rpmdrake.spec
+++ b/rpmdrake.spec
@@ -108,6 +108,8 @@ rm -rf $RPM_BUILD_ROOT
- fixes interactive_packtables dialogs initially much too small
because titi replaced ->size_request by ->get_size_request
(such dialog is for example "more information on packages")
+- don't display a too high message when there are many packages
+ with signatures problems (#4335)
* Mon Aug 4 2003 Guillaume Cottenceau <gc@mandrakesoft.com> 2.1-30mdk
- revert "use checkboxes instead of icons"