Merge lp:~gary-lasker/software-center/lp630248-fix-for-3.0 into lp:software-center/3.0

[Gary Lasker]

Hi Michael, I thought we might consider cherrypicking this fix for bug 630248 for Maverick, based on the number of dupes where folks report being unable to run Software Center after upgrading to Maverick.

I also noticed that the fix for bug 639701 in the 3.0 branch is still pending a release for Maverick. Think an SRU for these might be in order?

Thanks!
Gary

[Michael Vogt (mvo)]

On Thu, Feb 10, 2011 at 04:57:32AM -0000, Gary Lasker wrote:
> Gary Lasker has proposed merging lp:~gary-lasker/software-center/lp630248-fix-for-3.0 into lp:software-center/3.0.
>
> Requested reviews:
> Michael Vogt (mvo)
> Related bugs:
> #630248 software-center crashed with ValueError in _parse_localename()
> https://bugs.launchpad.net/bugs/630248
>
> For more details, see:
> https://code.launchpad.net/~gary-lasker/software-center/lp630248-fix-for-3.0/+merge/49178
>
> Hi Michael, I thought we might consider cherrypicking this fix for bug 630248 for Maverick, based on the number of dupes where folks report being unable to run Software Center after upgrading to Maverick.

Thanks a lot for this!

> I also noticed that the fix for bug 639701 in the 3.0 branch is still pending a release for Maverick. Think an SRU for these might be in order?

Indeed, I merged your branch and uploaded it to maverick-proposed now.

Cheers,
 Michael

> Thanks!
> Gary
>
> --
> https://code.launchpad.net/~gary-lasker/software-center/lp630248-fix-for-3.0/+merge/49178
> You are requested to review the proposed merge of lp:~gary-lasker/software-center/lp630248-fix-for-3.0 into lp:software-center/3.0.

> === modified file 'debian/changelog'
> --- debian/changelog 2010-12-09 22:51:46 +0000
> +++ debian/changelog 2011-02-10 04:56:49 +0000
> @@ -1,10 +1,17 @@
> software-center (3.0.8) UNRELEASED; urgency=low
>
> + [ Gary Lasker ]
> * softwarecenter/utils.py,
> softwarecenter/view/appdetailsview_gtk.py:
> - disable find-it-in-the-menu under Unity (LP: #639701)
>
> - -- Gary Lasker <email address hidden> Thu, 09 Dec 2010 17:50:58 -0500
> + [ Michael Vogt ]
> + * softwarecenter/app.py:
> + - on a invalid locale, reset the locale to "C" to avoid
> + later crashes in the apthistory that uses strptime
> + (lp: #630248)
> +
> + -- Gary Lasker <email address hidden> Wed, 09 Feb 2011 23:28:37 -0500
>
> software-center (3.0.7) maverick-proposed; urgency=low
>
>
> === modified file 'softwarecenter/app.py'
> --- softwarecenter/app.py 2010-10-03 11:09:16 +0000
> +++ softwarecenter/app.py 2011-02-10 04:56:49 +0000
> @@ -117,18 +117,14 @@
> try:
> locale.setlocale(locale.LC_ALL, "")
> except:
> - self._logger.exception("setlocale failed")
> + self._logger.exception("setlocale failed, reseting to C")
> + locale.setlocale(locale.LC_ALL, "C")
>
> # setup dbus and exit if there is another instance already
> # running
> self.setup_dbus_or_bring_other_instance_to_front(args)
> self.setup_database_rebuilding_listener()
>
> - try:
> - locale.setlocale(locale.LC_ALL, "")
> - except Exception, e:
> - self._logger.exception("setlocale failed")
> -
> # distro specific stuff
> self.distro = get_distro()
>
>

=== modified file 'debian/changelog'
--- debian/changelog	2010-12-09 22:51:46 +0000
+++ debian/changelog	2011-02-10 04:56:49 +0000
@@ -1,10 +1,17 @@
 software-center (3.0.8) UNRELEASED; urgency=low
 
+  [ Gary Lasker ]
   * softwarecenter/utils.py,
     softwarecenter/view/appdetailsview_gtk.py:
     - disable find-it-in-the-menu under Unity (LP: #639701)
 
- -- Gary Lasker <[e-mail]>  Thu, 09 Dec 2010 17:50:58 -0500
+  [ Michael Vogt ]
+  * softwarecenter/app.py:
+    - on a invalid locale, reset the locale to "C" to avoid
+      later crashes in the apthistory that uses strptime 
+      (lp: #630248) 
+
+ -- Gary Lasker <[e-mail]>  Wed, 09 Feb 2011 23:28:37 -0500
 
 software-center (3.0.7) maverick-proposed; urgency=low
 
 
=== modified file 'softwarecenter/app.py'
--- softwarecenter/app.py	2010-10-03 11:09:16 +0000
+++ softwarecenter/app.py	2011-02-10 04:56:49 +0000
@@ -117,18 +117,14 @@
         try:
             locale.setlocale(locale.LC_ALL, "")
         except:
-            self._logger.exception("setlocale failed")
+            self._logger.exception("setlocale failed, reseting to C")
+            locale.setlocale(locale.LC_ALL, "C")
 
         # setup dbus and exit if there is another instance already
         # running
         self.setup_dbus_or_bring_other_instance_to_front(args)
         self.setup_database_rebuilding_listener()
         
-        try:
-            locale.setlocale(locale.LC_ALL, "")
-        except Exception, e:
-            self._logger.exception("setlocale failed")
-
         # distro specific stuff
         self.distro = get_distro()