Ubuntu Software Center

Merge lp:~dobey/software-center/fix-version into lp:software-center

  1. fix-version
  2. Merge into trunk
Proposed by dobey
Status: Merged
Approved by: dobey
Approved revision: 3283
Merged at revision: 3283
Proposed branch: lp:~dobey/software-center/fix-version
Merge into: lp:software-center
Diff against target: 26 lines (+5/-3)
1 file modified
setup.py (+5/-3)
To merge this branch: bzr merge lp:~dobey/software-center/fix-version
Reviewer Review Type Date Requested Status
dobey Abstain
Paul Hummer (community) Approve
Review via email: mp+141832@code.launchpad.net

Commit message

Globally define a couple of variables needed for setup
Remove unused imports

To post a comment you must log in.
Revision history for this message
Paul Hummer (rockstar) :
review: Approve
Revision history for this message
dobey (dobey) :
review: Abstain

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'setup.py'
2--- setup.py 2012-12-19 09:39:37 +0000
3+++ setup.py 2013-01-03 23:18:22 +0000
4@@ -1,10 +1,7 @@
5 #!/usr/bin/env python
6
7 import platform
8-import distutils
9-import fnmatch
10 import glob
11-import os
12 import re
13 from subprocess import call
14 import sys
15@@ -34,6 +31,11 @@
16 open(channelfile, "w").write(s.replace("#DISTROSERIES#", DISTROSERIES))
17
18
19+# VERSION and DISTRO must be defined here for use in setup()
20+VERSION = None
21+DISTRO = None
22+
23+
24 # update version.py
25 def update_version():
26 changelog = Changelog(open("debian/changelog"), max_blocks=1)

Subscribers

People subscribed via source and target branches