Mageia Bugzilla – Attachment 9559 Details for
Bug 21433
Update failure when RPM download folder includes UTF-8 characters
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
New Account
|
Forgot Password
[patch]
fix directory not being UTF-8
0003-fix-directory-not-being-UTF-8-mga-21433.patch (text/plain), 2.59 KB, created by
Thierry Vignaud
on 2017-08-02 17:54:42 CEST
(
hide
)
Description:
fix directory not being UTF-8
Filename:
MIME Type:
Creator:
Thierry Vignaud
Created:
2017-08-02 17:54:42 CEST
Size:
2.59 KB
patch
obsolete
>From 8e9b61769d7c4b66c54c39886e3b5320fcd1378c Mon Sep 17 00:00:00 2001 >From: Thierry Vignaud <thierry.vignaud@gmail.com> >Date: Wed, 2 Aug 2017 17:50:30 +0200 >Subject: [PATCH 3/3] fix directory not being UTF-8 (mga#21433) > >rationale: gtk+3 only works with UTF-8 internally, so the issue here is >just that perl doesn't know it's UTF-8 >--- > mgaapplet | 16 +++++++++++++++- > 1 file changed, 15 insertions(+), 1 deletion(-) > >diff --git a/mgaapplet b/mgaapplet >index a0cd3968..23a2bcfc 100755 >--- a/mgaapplet >+++ b/mgaapplet >@@ -217,7 +217,7 @@ foreach my $opt (@ARGV) { > } > } > >-my ($download_all); >+my ($download_all) = 1; > my ($new_distro, $no_more_supported); > my ($current_apimdv_distro); > >@@ -259,7 +259,13 @@ $SIG{HUP} = \&restart_applet; > > run_program::raw({ detach => 1 }, 'ionice', '-p', $$, '-n7'); > >+ confirm_upgrade(); > my $bubble = Gtk3::Notify::Notification->new('', ''); >+Glib::Timeout->add_seconds(3000000, sub { >+ #go2State('new_distribution'); >+ #upgrade(); >+ confirm_upgrade(); >+}); > Gtk3->main; > > ugtk3::exit(0); >@@ -395,11 +401,14 @@ sub confirm_upgrade() { > Gtk3::FileChooserButton->new(N("Browse"), 'select-folder'), > 'selection-changed' => sub { > $temp_dir = $_[0]->get_filename; >+ c::set_tagged_utf8($temp_dir); > my $ok = -d $temp_dir && ! -l $temp_dir && ((stat($temp_dir))[4] == 0); > $ok or ask_warn(N("Error"), N("You must choose a directory owned by the super administrator!")); > }); > $browse->set_current_folder($download_dir); > >+ $new_distro ||= { url => 'http://toto', name => "toto" }; >+ use Data::Dumper; warn Dumper $new_distro; > my $res = fill_n_run_portable_dialog($w, > [ > get_banner(), >@@ -424,6 +433,9 @@ sub confirm_upgrade() { > > setVar('DO_NOT_ASK_FOR_DISTRO_UPGRADE', bool2text($warn_me)); > $local_config{DO_NOT_ASK_FOR_DISTRO_UPGRADE} = bool2text($warn_me); >+ #$temp_dir = eval { $browse->get_filename }; >+ warn "DIR=$download_dir (err=$@, res=$res)\n"; >+ warn "DIR=$temp_dir\n"; > if ($res) { > my $ok = -d $temp_dir && ! -l $temp_dir && ((stat($temp_dir))[4] == 0); > $ok or goto &confirm_upgrade; >@@ -461,6 +473,8 @@ sub no_more_supported_choice() { > my $w = new_portable_dialog(N("Your distribution is no longer supported")); > my ($b1, $b2); > my $choice = $no_more_supported ne 'none' ? 'upgrade' : undef; >+ $new_distro ||= { url => 'http://toto', name => "toto" }; >+ use Data::Dumper; warn Dumper $new_distro; > > my @widgets = ( > get_banner(N("New version of Mageia distribution")), >-- >2.13.3 >
From 8e9b61769d7c4b66c54c39886e3b5320fcd1378c Mon Sep 17 00:00:00 2001 From: Thierry Vignaud <thierry.vignaud@gmail.com> Date: Wed, 2 Aug 2017 17:50:30 +0200 Subject: [PATCH 3/3] fix directory not being UTF-8 (mga#21433) rationale: gtk+3 only works with UTF-8 internally, so the issue here is just that perl doesn't know it's UTF-8 --- mgaapplet | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/mgaapplet b/mgaapplet index a0cd3968..23a2bcfc 100755 --- a/mgaapplet +++ b/mgaapplet @@ -217,7 +217,7 @@ foreach my $opt (@ARGV) { } } -my ($download_all); +my ($download_all) = 1; my ($new_distro, $no_more_supported); my ($current_apimdv_distro); @@ -259,7 +259,13 @@ $SIG{HUP} = \&restart_applet; run_program::raw({ detach => 1 }, 'ionice', '-p', $$, '-n7'); + confirm_upgrade(); my $bubble = Gtk3::Notify::Notification->new('', ''); +Glib::Timeout->add_seconds(3000000, sub { + #go2State('new_distribution'); + #upgrade(); + confirm_upgrade(); +}); Gtk3->main; ugtk3::exit(0); @@ -395,11 +401,14 @@ sub confirm_upgrade() { Gtk3::FileChooserButton->new(N("Browse"), 'select-folder'), 'selection-changed' => sub { $temp_dir = $_[0]->get_filename; + c::set_tagged_utf8($temp_dir); my $ok = -d $temp_dir && ! -l $temp_dir && ((stat($temp_dir))[4] == 0); $ok or ask_warn(N("Error"), N("You must choose a directory owned by the super administrator!")); }); $browse->set_current_folder($download_dir); + $new_distro ||= { url => 'http://toto', name => "toto" }; + use Data::Dumper; warn Dumper $new_distro; my $res = fill_n_run_portable_dialog($w, [ get_banner(), @@ -424,6 +433,9 @@ sub confirm_upgrade() { setVar('DO_NOT_ASK_FOR_DISTRO_UPGRADE', bool2text($warn_me)); $local_config{DO_NOT_ASK_FOR_DISTRO_UPGRADE} = bool2text($warn_me); + #$temp_dir = eval { $browse->get_filename }; + warn "DIR=$download_dir (err=$@, res=$res)\n"; + warn "DIR=$temp_dir\n"; if ($res) { my $ok = -d $temp_dir && ! -l $temp_dir && ((stat($temp_dir))[4] == 0); $ok or goto &confirm_upgrade; @@ -461,6 +473,8 @@ sub no_more_supported_choice() { my $w = new_portable_dialog(N("Your distribution is no longer supported")); my ($b1, $b2); my $choice = $no_more_supported ne 'none' ? 'upgrade' : undef; + $new_distro ||= { url => 'http://toto', name => "toto" }; + use Data::Dumper; warn Dumper $new_distro; my @widgets = ( get_banner(N("New version of Mageia distribution")), -- 2.13.3
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 21433
:
9558
|
9559
|
9562