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

Proposed by Gary Lasker
Status: Merged
Merged at revision: 1121
Proposed branch: lp:~gary-lasker/software-center/lp630248-fix-for-3.0
Merge into: lp:software-center/3.0
Diff against target: 46 lines (+10/-7)
2 files modified
debian/changelog (+8/-1)
softwarecenter/app.py (+2/-6)
To merge this branch: bzr merge lp:~gary-lasker/software-center/lp630248-fix-for-3.0
Reviewer Review Type Date Requested Status
Michael Vogt Pending
Review via email: mp+49178@code.launchpad.net

Description of the change

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

To post a comment you must log in.
Michael Vogt (mvo) wrote :

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()
>
>

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2010-12-09 22:51:46 +0000
3+++ debian/changelog 2011-02-10 04:56:49 +0000
4@@ -1,10 +1,17 @@
5 software-center (3.0.8) UNRELEASED; urgency=low
6
7+ [ Gary Lasker ]
8 * softwarecenter/utils.py,
9 softwarecenter/view/appdetailsview_gtk.py:
10 - disable find-it-in-the-menu under Unity (LP: #639701)
11
12- -- Gary Lasker <gary.lasker@canonical.com> Thu, 09 Dec 2010 17:50:58 -0500
13+ [ Michael Vogt ]
14+ * softwarecenter/app.py:
15+ - on a invalid locale, reset the locale to "C" to avoid
16+ later crashes in the apthistory that uses strptime
17+ (lp: #630248)
18+
19+ -- Gary Lasker <gary.lasker@canonical.com> Wed, 09 Feb 2011 23:28:37 -0500
20
21 software-center (3.0.7) maverick-proposed; urgency=low
22
23
24=== modified file 'softwarecenter/app.py'
25--- softwarecenter/app.py 2010-10-03 11:09:16 +0000
26+++ softwarecenter/app.py 2011-02-10 04:56:49 +0000
27@@ -117,18 +117,14 @@
28 try:
29 locale.setlocale(locale.LC_ALL, "")
30 except:
31- self._logger.exception("setlocale failed")
32+ self._logger.exception("setlocale failed, reseting to C")
33+ locale.setlocale(locale.LC_ALL, "C")
34
35 # setup dbus and exit if there is another instance already
36 # running
37 self.setup_dbus_or_bring_other_instance_to_front(args)
38 self.setup_database_rebuilding_listener()
39
40- try:
41- locale.setlocale(locale.LC_ALL, "")
42- except Exception, e:
43- self._logger.exception("setlocale failed")
44-
45 # distro specific stuff
46 self.distro = get_distro()
47

Subscribers

People subscribed via source and target branches