click

Merge lp:click/devel into lp:click

  1. devel
  2. Merge into trunk
Proposed by Michael Vogt
Status: Merged
Approved by: Michael Vogt
Approved revision: 572
Merged at revision: 458
Proposed branch: lp:click/devel
Merge into: lp:click
Diff against target: 61 lines (+18/-4)
4 files modified
click/chroot.py (+4/-1)
click/commands/chroot.py (+2/-2)
debian/changelog (+10/-0)
doc/index.rst (+2/-1)
To merge this branch: bzr merge lp:click/devel
Reviewer Review Type Date Requested Status
Colin Watson Approve
Review via email: mp+257998@code.launchpad.net

Description of the change

Fix click chroot creation if no geop can be found and switch default chroot to ubuntu-sdk-14.04

To post a comment you must log in.
Revision history for this message
Colin Watson (cjwatson) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'click/chroot.py'
2--- click/chroot.py 2015-03-10 17:36:06 +0000
3+++ click/chroot.py 2015-05-01 07:31:05 +0000
4@@ -206,7 +206,10 @@
5 with urllib.request.urlopen(GEOIP_SERVER) as f:
6 xml_data = f.read()
7 et = ElementTree.fromstring(xml_data)
8- return et.find("CountryCode").text.lower()+"."
9+ cc = et.find("CountryCode")
10+ if not cc:
11+ return ""
12+ return cc.text.lower()+"."
13 except (ElementTree.ParseError, urllib.error.URLError):
14 pass
15 return ""
16
17=== modified file 'click/commands/chroot.py'
18--- click/commands/chroot.py 2014-10-13 12:48:35 +0000
19+++ click/commands/chroot.py 2015-05-01 07:31:05 +0000
20@@ -172,8 +172,8 @@
21 "-a", "--architecture", required=True,
22 help="architecture for the chroot")
23 parser.add_argument(
24- "-f", "--framework", default="ubuntu-sdk-13.10",
25- help="framework for the chroot (default: ubuntu-sdk-13.10)")
26+ "-f", "--framework", default="ubuntu-sdk-14.04",
27+ help="framework for the chroot (default: ubuntu-sdk-14.04)")
28 parser.add_argument(
29 "-s", "--series",
30 help="series to use for a newly-created chroot (defaults to a series "
31
32=== modified file 'debian/changelog'
33--- debian/changelog 2015-03-10 18:52:17 +0000
34+++ debian/changelog 2015-05-01 07:31:05 +0000
35@@ -1,3 +1,13 @@
36+click (0.4.39) UNRELEASED; urgency=low
37+
38+ [ Marco Trevisan (Treviño) ]
39+ * handle "IP NOT FOUND" error (LP: #1433234)
40+
41+ [ Michael Vogt ]
42+ * switch the default click chroot framework to ubuntu-sdk-14.04
43+
44+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 01 May 2015 09:18:36 +0200
45+
46 click (0.4.38.5) vivid; urgency=medium
47
48 [ Sebastien Bacher ]
49
50=== modified file 'doc/index.rst'
51--- doc/index.rst 2014-07-02 16:42:49 +0000
52+++ doc/index.rst 2015-05-01 07:31:05 +0000
53@@ -129,7 +129,8 @@
54 PYTHONPATH=$(pwd) \
55 GI_TYPELIB_PATH=$(pwd)/lib/click \
56 CLICK_BINARY=$(pwd)/bin/click \
57- python3 -m unittest discover tests.integration
58+ TEST_INTEGRATION=1 \
59+ python3 -m unittest discover click.tests.integration
60
61 to run against the build tree.
62

Subscribers

People subscribed via source and target branches

to all changes: