[Merge] ~gunnarhj/ubuntu/+source/glibc:ubuntu/devel into ~ubuntu-core-dev/ubuntu/+source/glibc:ubuntu/devel

[Dan Bungert]

Diff comments:

> diff --git a/debian/local/usr_sbin/update-locale b/debian/local/usr_sbin/update-locale
> index 3951cdd..0b55a5f 100755
> --- a/debian/local/usr_sbin/update-locale
> +++ b/debian/local/usr_sbin/update-locale
> @@ -64,7 +64,7 @@ else
>  }
>  for (@ARGV)
>  {
> -	if (m/(.*?)=(.*)/)
> +	if (m/(.+)=(.*)/)

I found this MP while reviewing some red items in the sponsor queue.  I think this change is an improvement but it might go over better if we match some of the other regex usage used earlier in the code.  What do you think about this:
if (m/(\w+)=(.*)/)
That should match more closely to that the previous read loop is expecting.

>  	{
>  		$arg{$1} = $2;
>  	}


-- 
https://code.launchpad.net/~gunnarhj/ubuntu/+source/glibc/+git/glibc/+merge/397621
Your team Ubuntu Core Development Team is requested to review the proposed merge of ~gunnarhj/ubuntu/+source/glibc:ubuntu/devel into ~ubuntu-core-dev/ubuntu/+source/glibc:ubuntu/devel.