pkgme-devportal

Merge lp:~jml/pkgme-devportal/binary-to-devportal into lp:pkgme-devportal

  1. binary-to-devportal
  2. Merge into trunk
Proposed by Jonathan Lange
Status: Merged
Approved by: James Westby
Approved revision: 47
Merged at revision: 47
Proposed branch: lp:~jml/pkgme-devportal/binary-to-devportal
Merge into: lp:pkgme-devportal
Diff against target: 59 lines (+10/-4)
3 files modified
LICENSE (+1/-1)
devportalbinary/database.py (+6/-0)
setup.py (+3/-3)
To merge this branch: bzr merge lp:~jml/pkgme-devportal/binary-to-devportal
Reviewer Review Type Date Requested Status
James Westby Approve
Review via email: mp+103680@code.launchpad.net

Commit message

Rename pkgme-binary to pkgme-devportal

Description of the change

Renames pkgme-binary to pkgme-devportal. Doesn't update LP API app name or config file location. They can be managed in separate deploys.

To post a comment you must log in.
Revision history for this message
James Westby (james-w) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'LICENSE'
2--- LICENSE 2011-08-23 17:21:54 +0000
3+++ LICENSE 2012-04-26 12:19:33 +0000
4@@ -1,6 +1,6 @@
5 Launchpad is Copyright 2011 Canonical Ltd.
6
7-Canonical Ltd ("Canonical") distributes the pkgme-binary source code
8+Canonical Ltd ("Canonical") distributes the pkgme-devportal source code
9 under the GNU Affero General Public License, version 3 ("AGPLv3").
10 The full text of this licence is given below.
11
12
13=== modified file 'devportalbinary/database.py'
14--- devportalbinary/database.py 2012-04-02 17:30:14 +0000
15+++ devportalbinary/database.py 2012-04-26 12:19:33 +0000
16@@ -40,6 +40,8 @@
17 from .utils import download_file
18
19
20+# XXX: Historic name of this package. Update to 'pkgme-devportal' and
21+# re-authorize.
22 APPLICATION_NAME = 'pkgme-binary'
23 SERVICE_ROOT = uris.LPNET_SERVICE_ROOT
24
25@@ -307,6 +309,10 @@
26 SQLITE = 'sqlite'
27 POSTGRES = 'postgres'
28
29+ # XXX: 'pkgme-binary' is the historic name of this package. Change this
30+ # to look first in ~/.config/pkgme-devportal/conf and then fall back to
31+ # this one. Once production systems are updated to the new config, remove
32+ # the fallback.
33 CONF_FILE = '~/.config/pkgme-binary/conf'
34
35 def __init__(self, store):
36
37=== modified file 'setup.py'
38--- setup.py 2012-03-22 11:51:44 +0000
39+++ setup.py 2012-04-26 12:19:33 +0000
40@@ -14,7 +14,7 @@
41 __version__ = get_version('devportalbinary/__init__.py')
42
43 setup(
44- name='pkgme-binary',
45+ name='pkgme-devportal',
46 version=__version__,
47 packages=find_packages(),
48 include_package_data=True,
49@@ -22,8 +22,8 @@
50 maintainer_email='pkgme-devs@lists.launchpad.net',
51 description=description('README'),
52 license='AGPLv3',
53- url='http://launchpad.net/pkgme-binary',
54- download_url='https://launchpad.net/pkgme-binary/+download',
55+ url='http://launchpad.net/pkgme-devportal',
56+ download_url='https://launchpad.net/pkgme-devportal/+download',
57 test_suite='devportalbinary.tests',
58 install_requires = [
59 'bzr',

Subscribers

People subscribed via source and target branches