[gentoo-portage-dev] [PATCH] emerge: Don't die when the user has an invalid locale setting

[gentoo-portage-dev] [PATCH] emerge: Don't die when the user has an invalid locale setting

[Mike Gilbert]

---
 pym/_emerge/main.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py
index 1a920f7..722da84 100644
--- a/pym/_emerge/main.py
+++ b/pym/_emerge/main.py
@@ -999,7 +999,10 @@ def emerge_main(args=None):
 	args = portage._decode_argv(args)
 
 	# Use system locale.
-	locale.setlocale(locale.LC_ALL, '')
+	try:
+		locale.setlocale(locale.LC_ALL, '')
+	except locale.Error as e:
+		print(e)
 
 	# Disable color until we're sure that it should be enabled (after
 	# EMERGE_DEFAULT_OPTS has been parsed).
-- 
2.0.4

Re: [gentoo-portage-dev] [PATCH] emerge: Don't die when the user has an invalid locale setting

[Alec Warner]

[-- Attachment #1: Type: text/plain, Size: 920 bytes --]

On Mon, Aug 4, 2014 at 12:45 PM, Mike Gilbert <floppym@gentoo.org> wrote:

> ---
>  pym/_emerge/main.py | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py
> index 1a920f7..722da84 100644
> --- a/pym/_emerge/main.py
> +++ b/pym/_emerge/main.py
> @@ -999,7 +999,10 @@ def emerge_main(args=None):
>         args = portage._decode_argv(args)
>
>         # Use system locale.
> -       locale.setlocale(locale.LC_ALL, '')
> +       try:
> +               locale.setlocale(locale.LC_ALL, '')
> +       except locale.Error as e:
> +               print(e)
>

Portage has its own output functions (writemsg?)
You need to decide if this should be printed even if -q is passed, should
it be colorized, etc...

-A


>
>         # Disable color until we're sure that it should be enabled (after
>         # EMERGE_DEFAULT_OPTS has been parsed).
> --
> 2.0.4
>
>
>

[-- Attachment #2: Type: text/html, Size: 1590 bytes --]

Re: [gentoo-portage-dev] [PATCH] emerge: Don't die when the user has an invalid locale setting

[Mike Gilbert]

On Tue, Aug 5, 2014 at 3:23 PM, Alec Warner <antarus@gentoo.org> wrote:
> On Mon, Aug 4, 2014 at 12:45 PM, Mike Gilbert <floppym@gentoo.org> wrote:
>>
>> ---
>>  pym/_emerge/main.py | 5 ++++-
>>  1 file changed, 4 insertions(+), 1 deletion(-)
>>
>> diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py
>> index 1a920f7..722da84 100644
>> --- a/pym/_emerge/main.py
>> +++ b/pym/_emerge/main.py
>> @@ -999,7 +999,10 @@ def emerge_main(args=None):
>>         args = portage._decode_argv(args)
>>
>>         # Use system locale.
>> -       locale.setlocale(locale.LC_ALL, '')
>> +       try:
>> +               locale.setlocale(locale.LC_ALL, '')
>> +       except locale.Error as e:
>> +               print(e)
>
>
> Portage has its own output functions (writemsg?)
> You need to decide if this should be printed even if -q is passed, should it
> be colorized, etc...
>
> -A

I would appreciate it if someone more familiar with portage could make
that decision and replace the print(e) with something better. Please
don't wait for me to familiarize myself with the code to fix this
rather annoying behavior.

[gentoo-portage-dev] [PATCHv2] emerge: Don't die when the user has an invalid locale setting

[Mike Gilbert]

Resolves bug 519074.
---
 pym/_emerge/main.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py
index 1a920f7..52aa9c5 100644
--- a/pym/_emerge/main.py
+++ b/pym/_emerge/main.py
@@ -999,7 +999,10 @@ def emerge_main(args=None):
 	args = portage._decode_argv(args)
 
 	# Use system locale.
-	locale.setlocale(locale.LC_ALL, '')
+	try:
+		locale.setlocale(locale.LC_ALL, '')
+	except locale.Error as e:
+		writemsg_level("setlocale: %s\n" % e, level=logging.WARN)
 
 	# Disable color until we're sure that it should be enabled (after
 	# EMERGE_DEFAULT_OPTS has been parsed).
-- 
2.0.4

Re: [gentoo-portage-dev] [PATCHv2] emerge: Don't die when the user has an invalid locale setting

[Sebastian Luther]

Am 06.08.2014 23:39, schrieb Mike Gilbert:
> Resolves bug 519074.
> ---
>  pym/_emerge/main.py | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py
> index 1a920f7..52aa9c5 100644
> --- a/pym/_emerge/main.py
> +++ b/pym/_emerge/main.py
> @@ -999,7 +999,10 @@ def emerge_main(args=None):
>  	args = portage._decode_argv(args)
>  
>  	# Use system locale.
> -	locale.setlocale(locale.LC_ALL, '')
> +	try:
> +		locale.setlocale(locale.LC_ALL, '')
> +	except locale.Error as e:
> +		writemsg_level("setlocale: %s\n" % e, level=logging.WARN)
>  
>  	# Disable color until we're sure that it should be enabled (after
>  	# EMERGE_DEFAULT_OPTS has been parsed).
> 

Which locale does it use if this fails? Is it reasonable to continue?

Re: [gentoo-portage-dev] [PATCHv2] emerge: Don't die when the user has an invalid locale setting

[Mike Gilbert]

On Wed, Aug 6, 2014 at 5:55 PM, Sebastian Luther <SebastianLuther@gmx.de> wrote:
> Am 06.08.2014 23:39, schrieb Mike Gilbert:
>> Resolves bug 519074.
>> ---
>>  pym/_emerge/main.py | 5 ++++-
>>  1 file changed, 4 insertions(+), 1 deletion(-)
>>
>> diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py
>> index 1a920f7..52aa9c5 100644
>> --- a/pym/_emerge/main.py
>> +++ b/pym/_emerge/main.py
>> @@ -999,7 +999,10 @@ def emerge_main(args=None):
>>       args = portage._decode_argv(args)
>>
>>       # Use system locale.
>> -     locale.setlocale(locale.LC_ALL, '')
>> +     try:
>> +             locale.setlocale(locale.LC_ALL, '')
>> +     except locale.Error as e:
>> +             writemsg_level("setlocale: %s\n" % e, level=logging.WARN)
>>
>>       # Disable color until we're sure that it should be enabled (after
>>       # EMERGE_DEFAULT_OPTS has been parsed).
>>
>
> Which locale does it use if this fails? Is it reasonable to continue?
>

As far as I can tell, it uses POSIX/C, just as if the call had never
taken place.

Re: [gentoo-portage-dev] [PATCHv2] emerge: Don't die when the user has an invalid locale setting

[Mike Gilbert]

On Wed, Aug 6, 2014 at 6:20 PM, Mike Gilbert <floppym@gentoo.org> wrote:
> On Wed, Aug 6, 2014 at 5:55 PM, Sebastian Luther <SebastianLuther@gmx.de> wrote:
>> Am 06.08.2014 23:39, schrieb Mike Gilbert:
>>> Resolves bug 519074.
>>> ---
>>>  pym/_emerge/main.py | 5 ++++-
>>>  1 file changed, 4 insertions(+), 1 deletion(-)
>>>
>>> diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py
>>> index 1a920f7..52aa9c5 100644
>>> --- a/pym/_emerge/main.py
>>> +++ b/pym/_emerge/main.py
>>> @@ -999,7 +999,10 @@ def emerge_main(args=None):
>>>       args = portage._decode_argv(args)
>>>
>>>       # Use system locale.
>>> -     locale.setlocale(locale.LC_ALL, '')
>>> +     try:
>>> +             locale.setlocale(locale.LC_ALL, '')
>>> +     except locale.Error as e:
>>> +             writemsg_level("setlocale: %s\n" % e, level=logging.WARN)
>>>
>>>       # Disable color until we're sure that it should be enabled (after
>>>       # EMERGE_DEFAULT_OPTS has been parsed).
>>>
>>
>> Which locale does it use if this fails? Is it reasonable to continue?
>>
>
> As far as I can tell, it uses POSIX/C, just as if the call had never
> taken place.

From setlocale(3):

       If its value is not a valid locale specification, the locale is
unchanged, and setlocale()
       returns NULL.

Re: [gentoo-portage-dev] [PATCHv2] emerge: Don't die when the user has an invalid locale setting

[Brian Dolbec]

On Wed,  6 Aug 2014 17:39:14 -0400
Mike Gilbert <floppym@gentoo.org> wrote:

> Resolves bug 519074.
> ---
>  pym/_emerge/main.py | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 

Applied, thank you for the patch.

I edited the commit message a bit to conform to our preferred style.

----

emerge: fix invalid locale setting (bug 519074)

Don't die when the user has an invalid locale setting.
Resolves bug 519074.

-- 
Brian Dolbec <dolsen>