Ubuntu One Client

Merge lp:~dobey/ubuntuone-client/update-4-2 into lp:ubuntuone-client/stable-4-2

  1. update-4-2
  2. Merge into stable-4-2
Proposed by dobey
Status: Merged
Merged at revision: 1358
Proposed branch: lp:~dobey/ubuntuone-client/update-4-2
Merge into: lp:ubuntuone-client/stable-4-2
Diff against target: 25 lines (+2/-2)
2 files modified
tests/proxy/test_tunnel_server.py (+1/-1)
ubuntuone/proxy/tunnel_server.py (+1/-1)
To merge this branch: bzr merge lp:~dobey/ubuntuone-client/update-4-2
Reviewer Review Type Date Requested Status
Brian Curtin (community) Approve
Review via email: mp+142804@code.launchpad.net

Commit message

[Mike McCracken]

    - Fix check for configured proxy on mac/win.

To post a comment you must log in.
Revision history for this message
Brian Curtin (brian.curtin) :
review: Approve
Revision history for this message
Ubuntu One Auto Pilot (otto-pilot) wrote :
Download full text (278.2 KiB)

The attempt to merge lp:~dobey/ubuntuone-client/update-4-2 into lp:ubuntuone-client/stable-4-2 failed. Below is the output from the failed tests.

/usr/bin/gnome-autogen.sh
checking for autoconf >= 2.53...
  testing autoconf2.50... not found.
  testing autoconf... found 2.69
checking for automake >= 1.10...
  testing automake-1.12... not found.
  testing automake-1.11... found 1.11.6
checking for libtool >= 1.5...
  testing libtoolize... found 2.4.2
checking for intltool >= 0.30...
  testing intltoolize... found 0.50.2
checking for pkg-config >= 0.14.0...
  testing pkg-config... found 0.26
checking for gtk-doc >= 1.0...
  testing gtkdocize... found 1.18
Checking for required M4 macros...
Checking for forbidden M4 macros...
Processing ./configure.ac
Running libtoolize...
libtoolize: putting auxiliary files in `.'.
libtoolize: copying file `./ltmain.sh'
libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `m4'.
libtoolize: copying file `m4/libtool.m4'
libtoolize: copying file `m4/ltoptions.m4'
libtoolize: copying file `m4/ltsugar.m4'
libtoolize: copying file `m4/ltversion.m4'
libtoolize: copying file `m4/lt~obsolete.m4'
Running intltoolize...
Running gtkdocize...
Running aclocal-1.11...
Running autoconf...
Running autoheader...
Running automake-1.11...
Running ./configure --enable-gtk-doc --enable-debug ...
checking for a BSD-compatible install... /usr/bin/install -c
checking whether build environment is sane... yes
checking for a thread-safe mkdir -p... /bin/mkdir -p
checking for gawk... no
checking for mawk... mawk
checking whether make sets $(MAKE)... yes
checking how to create a ustar tar archive... gnutar
checking whether make supports nested variables... yes
checking for style of include used by make... GNU
checking for gcc... gcc
checking whether the C compiler works... yes
checking for C compiler default output file name... a.out
checking for suffix of executables...
checking whether we are cross compiling... no
checking for suffix of object files... o
checking whether we are using the GNU C compiler... yes
checking whether gcc accepts -g... yes
checking for gcc option to accept ISO C89... none needed
checking dependency style of gcc... gcc3
checking for library containing strerror... none required
checking for gcc... (cached) gcc
checking whether we are using the GNU C compiler... (cached) yes
checking whether gcc accepts -g... (cached) yes
checking for gcc option to accept ISO C89... (cached) none needed
checking dependency style of gcc... (cached) gcc3
checking build system type... x86_64-unknown-linux-gnu
checking host system type... x86_64-unknown-linux-gnu
checking how to print strings... printf
checking for a sed that does not truncate output... /bin/sed
checking for grep that handles long lines and -e... /bin/grep
checking for egrep... /bin/grep -E
checking for fgrep... /bin/grep -F
checking for ld used by gcc... /usr/bin/ld
checking if the linker (/usr/bin/ld) is GNU ld... yes
checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B
checking the name lister (/usr/bin/nm -B) interface... BSD nm
checking whether ln -s works... yes
checking the maximum length of command line arguments... 1572864
checking whether the sh...

lp:~dobey/ubuntuone-client/update-4-2 updated
1358. By dobey

[Mike McCracken]

    - Fix check for configured proxy on mac/win.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/proxy/test_tunnel_server.py'
2--- tests/proxy/test_tunnel_server.py 2012-04-09 20:08:42 +0000
3+++ tests/proxy/test_tunnel_server.py 2013-01-10 22:30:29 +0000
4@@ -569,7 +569,7 @@
5 if enabled:
6 self.proxy_type = tunnel_server.QNetworkProxy.HttpProxy
7 else:
8- self.proxy_type = tunnel_server.QNetworkProxy.DefaultProxy
9+ self.proxy_type = tunnel_server.QNetworkProxy.NoProxy
10
11 def type(self):
12 """Return the proxy type configured."""
13
14=== modified file 'ubuntuone/proxy/tunnel_server.py'
15--- ubuntuone/proxy/tunnel_server.py 2012-04-09 20:08:42 +0000
16+++ ubuntuone/proxy/tunnel_server.py 2013-01-10 22:30:29 +0000
17@@ -369,7 +369,7 @@
18 QNetworkProxyFactory.setUseSystemConfiguration(True)
19 query = QNetworkProxyQuery(host, port)
20 proxies = QNetworkProxyFactory.systemProxyForQuery(query)
21- return len(proxies) and proxies[0].type() != QNetworkProxy.DefaultProxy
22+ return len(proxies) and proxies[0].type() != QNetworkProxy.NoProxy
23
24
25 def install_qt_dbus():

Subscribers

People subscribed via source and target branches

to status/vote changes: