Ubuntu File Manager App

Merge lp:~nskaggs/ubuntu-filemanager-app/fix-internet-check-jenkins into lp:ubuntu-filemanager-app

  1. fix-internet-check-jenkins
  2. Merge into trunk
Proposed by Nicholas Skaggs on 2015-11-19
Status: Merged
Approved by: Alan Pope 🍺🐧🐱 🦄 on 2015-11-19
Approved revision: 502
Merged at revision: 502
Proposed branch: lp:~nskaggs/ubuntu-filemanager-app/fix-internet-check-jenkins
Merge into: lp:ubuntu-filemanager-app
Diff against target: 12 lines (+1/-1)
1 file modified
get-click-deps (+1/-1)
To merge this branch: bzr merge lp:~nskaggs/ubuntu-filemanager-app/fix-internet-check-jenkins
Reviewer Review Type Date Requested Status
Alan Pope 🍺🐧🐱 🦄 2015-11-19 Approve on 2015-11-19
Jenkins Bot continuous-integration Approve on 2015-11-19
Review via email: mp+278026@code.launchpad.net

Commit Message

fix internet check for jenkins

Description of the Change

fix internet check for jenkins

To post a comment you must log in.
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
Alan Pope 🍺🐧🐱 🦄 (popey) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'get-click-deps'
2--- get-click-deps 2015-10-14 11:21:13 +0000
3+++ get-click-deps 2015-11-19 15:46:34 +0000
4@@ -128,7 +128,7 @@
5
6 def check_internet_connection():
7 try:
8- urllib.request.urlopen('http://www.google.com', timeout=20)
9+ urllib.request.urlopen('http://www.launchpad.net', timeout=20)
10 return True
11 except urllib2.error.URLError as err:
12 pass

Subscribers

People subscribed via source and target branches