summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-10-08 17:37:23 +0000
committerThierry Vignaud <tv@mageia.org>2012-10-08 17:37:23 +0000
commit4b5ea6422172f4cc577f8bedb61f1ad340b17c9b (patch)
tree7c738b856a1fad0f2c0e751e5f72098eeb8f7c8f
parent87b6a7112b7f617727706f87c700fbb1bb7519e9 (diff)
downloadurpmi-4b5ea6422172f4cc577f8bedb61f1ad340b17c9b.tar
urpmi-4b5ea6422172f4cc577f8bedb61f1ad340b17c9b.tar.gz
urpmi-4b5ea6422172f4cc577f8bedb61f1ad340b17c9b.tar.bz2
urpmi-4b5ea6422172f4cc577f8bedb61f1ad340b17c9b.tar.xz
urpmi-4b5ea6422172f4cc577f8bedb61f1ad340b17c9b.zip
add scrollbar for long one liner messages (mga#5118)
-rw-r--r--NEWS1
-rwxr-xr-xgurpmi22
2 files changed, 2 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 5214f701..63e836cb 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,7 @@
(no more possible since rpm 4.6 which doesn't handle --repackage)
- drop --repackage option (non working since 2009)
- gurpmi:
+ o add scrollbar for long one liner messages (mga#5118)
o wrap big messages (mga#5118)
- library:
o enhanced doc
diff --git a/gurpmi2 b/gurpmi2
index 5c7364d7..922a85c7 100755
--- a/gurpmi2
+++ b/gurpmi2
@@ -152,7 +152,7 @@ sub configure_urpm() {
}
my $nb_lines = $message =~ tr/\n/\n/;
my $w;
- if ($nb_lines > 30) {
+ if ($nb_lines > 30 || $message =~ /^transaction is too small/) {
$w = Gtk2::Dialog->new(N("Warning"), $mainw, [qw(modal destroy-with-parent)], N("Ok"), 'ok');
$w->vbox->add(my $f = Gtk2::Frame->new);
my $sw = create_scrolled_window(my $text = Gtk2::TextView->new);