Merge lp:~brian-murray/software-center/bug-1095823 into lp:software-center

Proposed by Brian Murray on 2013-01-19
Status: Merged
Merged at revision: 3287
Proposed branch: lp:~brian-murray/software-center/bug-1095823
Merge into: lp:software-center
Diff against target: 30 lines (+6/-1)
2 files modified
debian/changelog (+5/-0)
softwarecenter/paths.py (+1/-1)
To merge this branch: bzr merge lp:~brian-murray/software-center/bug-1095823
Reviewer Review Type Date Requested Status
Barry Warsaw 2013-01-19 Approve on 2013-01-23
Review via email: mp+143971@code.launchpad.net
To post a comment you must log in.
Barry Warsaw (barry) wrote :

Looks good to me.

<xnox> barry: it's OEM priority. we should be landing it and sru'ing it.

review: Approve

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 2013-01-18 20:11:22 +0000
3+++ debian/changelog 2013-01-19 00:03:19 +0000
4@@ -1,8 +1,13 @@
5 software-center (5.5.4) UNRELEASED; urgency=low
6
7+ [ Barry Warsaw ]
8 * lp:~barry/software-center/lp1100408:
9 - debian/control: Update Depends for new oneconf packaging.
10
11+ [ Brian Murray ]
12+ * software-center/paths.py:
13+ - modify the OEM_CHANNEL_DESCRIPTOR path (LP: #1095823)
14+
15 -- Barry Warsaw <barry@ubuntu.com> Thu, 17 Jan 2013 11:28:58 -0500
16
17 software-center (5.5.3) raring; urgency=low
18
19=== modified file 'softwarecenter/paths.py'
20--- softwarecenter/paths.py 2012-12-17 17:29:24 +0000
21+++ softwarecenter/paths.py 2013-01-19 00:03:19 +0000
22@@ -76,7 +76,7 @@
23
24
25 # OEM
26-OEM_CHANNEL_DESCRIPTOR = "/var/lib/ubuntu-dist-channel"
27+OEM_CHANNEL_DESCRIPTOR = "/var/lib/ubuntu_dist_channel"
28
29 # apport
30 APPORT_RECOVERABLE_ERROR = "/usr/share/apport/recoverable_problem"