diff options
| author | Pablo Saratxaga <pablo@mandriva.com> | 2003-02-21 21:08:33 +0000 |
|---|---|---|
| committer | Pablo Saratxaga <pablo@mandriva.com> | 2003-02-21 21:08:33 +0000 |
| commit | 7011a6ca9258aea09fd58a56fead264fd240eaa5 (patch) | |
| tree | eb283c4d0faa021217c073537a9888c77361850d | |
| parent | b13341238e4bf3a3e1096d99d6df8e3eeeef25aa (diff) | |
| download | urpmi-7011a6ca9258aea09fd58a56fead264fd240eaa5.tar urpmi-7011a6ca9258aea09fd58a56fead264fd240eaa5.tar.gz urpmi-7011a6ca9258aea09fd58a56fead264fd240eaa5.tar.bz2 urpmi-7011a6ca9258aea09fd58a56fead264fd240eaa5.tar.xz urpmi-7011a6ca9258aea09fd58a56fead264fd240eaa5.zip | |
Put quotes around values passed to gmessage on the command line
| -rwxr-xr-x | urpmi | 16 |
1 files changed, 9 insertions, 7 deletions
@@ -372,7 +372,7 @@ if (%{$state->{ask_unselect} || {}}) { if ($X) { my $ok = _("Ok"); my $cancel = _("Cancel"); - `gmessage -default $ok -buttons "$ok:0,$cancel:2" "$msg"`; + `gmessage -default "$ok" -buttons "$ok:0,$cancel:2" "$msg"`; $? and exit 0; } else { $noexpr = _("Nn"); @@ -414,7 +414,7 @@ if (%{$state->{ask_remove} || {}}) { if ($X) { my $ok = _("Ok"); my $cancel = _("Cancel"); - `gmessage -default $ok -buttons "$ok:0,$cancel:2" "$msg"`; + `gmessage -default "$ok" -buttons "$ok:0,$cancel:2" "$msg"`; $? and exit 0; } else { $noexpr = _("Nn"); @@ -463,7 +463,7 @@ if (@root_only) { if ($X) { my $ok = _("Ok"); my $cancel = _("Cancel"); - `gmessage -default $ok -buttons "$ok:0,$cancel:2" "$msg:\n$p\n\n$msg2"`; + `gmessage -default "$ok" -buttons "$ok:0,$cancel:2" "$msg:\n$p\n\n$msg2"`; $? and exit 0; } else { $noexpr = _("Nn"); @@ -506,7 +506,7 @@ my %sources = $urpm->download_source_packages($local_sources, $list, my $ok = _("Ok"); my $cancel = _("Cancel"); $msg =~ s/"/\\"/g; - `gmessage -default $ok -buttons "$ok:0,$cancel:2" "$msg"`; + `gmessage -default "$ok" -buttons "$ok:0,$cancel:2" "$msg"`; !$?; } else { defined message_input("$msg\n$msg2 "); @@ -532,7 +532,7 @@ if ($urpm->{options}{'verify-rpm'}) { if ($X) { my $ok = _("Ok"); my $cancel = _("Cancel"); - `gmessage -default $cancel -buttons "$ok:0,$cancel:2" "$msg:\n$p\n\n$msg2"`; + `gmessage -default "$cancel" -buttons "$ok:0,$cancel:2" "$msg:\n$p\n\n$msg2"`; $? and exit 1; } else { $noexpr = _("Nn"); @@ -660,7 +660,8 @@ sub log_it { sub message { my ($msg, $noX) = @_; if ($X && !$noX && !$auto) { - `gmessage -default Ok -buttons Ok "$msg"`; + my $ok = _("Ok"); + `gmessage -default "$ok" -buttons "$ok" "$msg"`; $bug and log_it($msg); } else { if ($bug) { @@ -674,7 +675,8 @@ sub message_input { my ($msg, $default_input) = @_; if ($X && !default_input) { #- if a default input is given, the user doesn't have to choose (and being asked). - `gmessage -default Ok -buttons Ok "$msg"`; + my $ok = _("Ok"); + `gmessage -default "$ok" -buttons "$ok" "$msg"`; $bug and log_it($msg); } else { if ($bug) { |