Merge into stable-1-4 : fix-u1prefs-self-removal : Code : Ubuntu One Client

Status:

Rejected

Rejected by:

John Lenton on 2010-09-22

Proposed branch:

lp:~chipaca/ubuntuone-client/fix-u1prefs-self-removal

Merge into:

lp:ubuntuone-client/stable-1-4

Diff against target:

26 lines (+4/-4)

2 files modified

bin/ubuntuone-preferences (+1/-1)
ubuntuone/api/restclient.py (+3/-3)

To merge this branch:

bzr merge lp:~chipaca/ubuntuone-client/fix-u1prefs-self-removal

Critical

Fix Released

Link a bug report

Reviewer	Date Requested	Status
dobey (community)		Disapprove on 2010-09-22
Alejandro J. Cura (community)		Approve on 2010-09-22
Rodrigo Moya (community)	2010-09-22	Approve on 2010-09-22
Review via email: mp+36251@code.launchpad.net

Commit message

correctly stringify http errors that occur in restclient (in another process), and fix the call to bus.get_object in the case of removing the current machine's token.

Description of the change

correctly stringify http errors that occur in restclient (in another process), and fix the call to bus.get_object in the case of removing the current machine's token.

Revision history for this message

Rodrigo Moya (rodrigo-moya) on 2010-09-22:

#

review: Approve

Revision history for this message

Alejandro J. Cura (alecu) wrote on 2010-09-22:

#

Fixes stuff, looks good.

review: Approve

Revision history for this message

dobey (dobey) wrote on 2010-09-22:

#

Download full text (8.3 KiB)

The attempt to merge lp:~chipaca/ubuntuone-client/fix-u1prefs-self-removal into lp:ubuntuone-client/stable-1-4 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.67
checking for automake >= 1.10...
  testing automake-1.11... found 1.11.1
checking for libtool >= 1.5...
  testing libtoolize... found 2.2.6b
checking for intltool >= 0.30...
  testing intltoolize... found 0.41.1
checking for pkg-config >= 0.14.0...
  testing pkg-config... found 0.25
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 aclocal-1.11...
Running autoconf...
Running autoheader...
Running automake-1.11...
Running ./configure --with-protocol=/var/cache/tarmac/ubuntuone-storage-protocol/stable-1-4 --with-sso=/var/cache/tarmac/ubuntu-sso-client/stable-1-0 ...
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... gawk
checking whether make sets $(MAKE)... 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... i686-pc-linux-gnu
checking host system type... i686-pc-linux-gnu
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 shell understands some XSI constructs... yes
checking whether the shell understands "+="... yes
checking for /usr/bin/ld option to reload object files... -r
checking for objdump... objdump
checking...

The attempt to merge lp:~chipaca/ubuntuone-client/fix-u1prefs-self-removal into lp:ubuntuone-client/stable-1-4 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.67
checking for automake >= 1.10...
  testing automake-1.11... found 1.11.1
checking for libtool >= 1.5...
  testing libtoolize... found 2.2.6b
checking for intltool >= 0.30...
  testing intltoolize... found 0.41.1
checking for pkg-config >= 0.14.0...
  testing pkg-config... found 0.25
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 aclocal-1.11...
Running autoconf...
Running autoheader...
Running automake-1.11...
Running ./configure --with-protocol=/var/cache/tarmac/ubuntuone-storage-protocol/stable-1-4 --with-sso=/var/cache/tarmac/ubuntu-sso-client/stable-1-0 ...
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... gawk
checking whether make sets $(MAKE)... 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... i686-pc-linux-gnu
checking host system type... i686-pc-linux-gnu
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 shell understands some XSI constructs... yes
checking whether the shell understands "+="... yes
checking for /usr/bin/ld option to reload object files... -r
checking for objdump... objdump
checking how to recognize dependent libraries... pass_all
checking for ar... ar
checking for strip... strip
checking for ranlib... ranlib
checking command to parse /usr/bin/nm -B output from gcc object... ok
checking how to run the C preprocessor... gcc -E
checking for ANSI C header files... yes
checking for sys/types.h... yes
checking for sys/stat.h... yes
checking for stdlib.h... yes
checking for string.h... yes
checking for memory.h... yes
checking for strings.h... yes
checking for inttypes.h... yes
checking for stdint.h... yes
checking for unistd.h... yes
checking for dlfcn.h... yes
checking for objdir... .libs
checking if gcc supports -fno-rtti -fno-exceptions... no
checking for gcc option to produce PIC... -fPIC -DPIC
checking if gcc PIC flag -fPIC -DPIC works... yes
checking if gcc static flag -static works... yes
checking if gcc supports -c -o file.o... yes
checking if gcc supports -c -o file.o... (cached) yes
checking whether the gcc linker (/usr/bin/ld) supports shared libraries... yes
checking whether -lc should be explicitly linked in... no
checking dynamic linker characteristics... GNU/Linux ld.so
checking how to hardcode library paths into programs... immediate
checking whether stripping libraries is possible... yes
checking if libtool supports shared libraries... yes
checking whether to build shared libraries... yes
checking whether to build static libraries... yes
checking for pkg-config... /usr/bin/pkg-config
checking pkg-config is at least version 0.19... yes
checking whether NLS is requested... yes
checking for intltool >= 0.40.0... 0.41.1 found
checking for intltool-update... /usr/bin/intltool-update
checking for intltool-merge... /usr/bin/intltool-merge
checking for intltool-extract... /usr/bin/intltool-extract
checking for xgettext... /usr/bin/xgettext
checking for msgmerge... /usr/bin/msgmerge
checking for msgfmt... /usr/bin/msgfmt
checking for gmsgfmt... /usr/bin/msgfmt
checking for perl... /usr/bin/perl
checking for perl >= 5.8.1... 5.10.1
checking for XML::Parser... ok
checking for lndir... /usr/bin/lndir
checking for icontool-render... /usr/bin/icontool-render
checking development series build... no
checking for a Python interpreter with version >= 2.5... python
checking for python... /usr/bin/python
checking for python version... 2.6
checking for python platform... linux2
checking for python script directory... ${prefix}/lib/python2.6/dist-packages
checking for python extension module directory... ${exec_prefix}/lib/python2.6/dist-packages
checking for pycentral... no
checking for ubuntu-sso-client... /var/cache/tarmac/ubuntu-sso-client/stable-1-0
checking for ubuntuone-storage-protocol... /var/cache/tarmac/ubuntuone-storage-protocol/stable-1-4
checking for NAUTILUS... yes
checking for DBUS... yes
checking whether to build contacts grid or list view... list
checking for gobject-introspection... yes
checking for glib-genmarshal... /usr/bin/glib-genmarshal
checking for SETTINGS_PLUGIN... yes
configure: creating ./config.status
config.status: creating Makefile
config.status: creating data/Makefile
config.status: creating libsyncdaemon/Makefile
config.status: creating libsyncdaemon/libsyncdaemon-1.0.pc
config.status: creating nautilus/Makefile
config.status: creating po/Makefile.in
config.status: creating gsd-plugin/Makefile
config.status: creating config.h
config.status: executing depfiles commands
config.status: executing libtool commands
config.status: executing po/stamp-it commands
Now type `make' to compile ubuntuone-client
if test "x." != "x."; then \
		/bin/mkdir -p ubuntuone; \
		/bin/mkdir -p tests; \
		(cd ubuntuone && /usr/bin/lndir ./../ubuntuone > /dev/null); \
		(cd tests && /usr/bin/lndir ./../tests > /dev/null); \
	fi
sed -e 's|\@localedir\@|/usr/local/share/locale|g' \
	-e 's|\@libexecdir\@|/usr/local/libexec|g' \
	-e 's|\@GETTEXT_PACKAGE\@|ubuntuone-client|g' \
	-e 's|\@SSO_APP_NAME\@|Ubuntu One|g' \
	-e 's|\@SSO_TC_URL\@|https://one.ubuntu.com/terms|g' \
	-e "s|\@SSO_DESCRIPTION\@|Ubuntu One uses a Ubuntu Single Sign-On (SSO) account, and if you don't yet have one, this process will create one for you|g" \
	-e 's|\@VERSION\@|1.4.2|g' < ubuntuone/clientdefs.py.in > ubuntuone/clientdefs.py
/bin/mkdir -p docs
if test "x." != "x." -a -f "./docs/syncdaemon_dbus_api.txt"; then \
		ln -s "./docs/syncdaemon_dbus_api.txt" "docs/syncdaemon_dbus_api.txt"; \
	else \
		PYTHONPATH=""/var/cache/tarmac/ubuntu-sso-client/stable-1-0:/var/cache/tarmac/ubuntuone-storage-protocol/stable-1-4:.:."" SRCDIR="." /usr/bin/python ./contrib/dbus-docs; \
	fi

configure.ac:12: installing `./config.guess'
configure.ac:12: installing `./config.sub'
configure.ac:7: installing `./install-sh'
configure.ac:7: installing `./missing'
gsd-plugin/Makefile.am: installing `./depcomp'
Traceback (most recent call last):
  File "./contrib/dbus-docs", line 32, in <module>
    from contrib.testing.testcase import (
  File "/var/cache/tarmac/ubuntuone-client/stable-1-4/contrib/testing/testcase.py", line 30, in <module>
    from ubuntuone.syncdaemon import (
  File "/var/cache/tarmac/ubuntuone-client/stable-1-4/ubuntuone/syncdaemon/action_queue.py", line 52, in <module>
    from ubuntuone.storageprotocol import protocol_pb2
ImportError: cannot import name protocol_pb2
make: *** [docs] Error 1

Revision history for this message

dobey (dobey) wrote on 2010-09-22:

#

This exact branch is now already merged into trunk. It is also stacked on trunk. Please submit a branch that is stacked on stable-1-4 with this change instead.

review: Disapprove

1	=== modified file 'bin/ubuntuone-preferences'
2	--- bin/ubuntuone-preferences 2010-09-16 13:08:33 +0000
3	+++ bin/ubuntuone-preferences 2010-09-22 04:32:42 +0000
4	@@ -464,7 +464,7 @@
5
6	if token == oauth_token.key:
7	try:
8	- client = self.bus.get_object(DBUS_IFACE_CRED_NAME,
9	+ client = self.bus.get_object(DBUS_BUS_NAME,
10	DBUS_CRED_PATH,
11	follow_name_owner_changes=True)
12	iface = dbus.Interface(client, DBUS_IFACE_CRED_NAME)
13
14	=== modified file 'ubuntuone/api/restclient.py'
15	--- ubuntuone/api/restclient.py 2010-09-13 13:32:04 +0000
16	+++ ubuntuone/api/restclient.py 2010-09-22 04:32:42 +0000
17	@@ -68,6 +68,6 @@
18	return simplejson.loads(data)
19
20	except urllib2.HTTPError, e:
21	- print e
22	- return {'error' : e}
23	-
24	+ # the error is not pickle-able, so str() it
25	+ return {'error' : str(e)}
26	+

Ubuntu One Client

Merge lp:~chipaca/ubuntuone-client/fix-u1prefs-self-removal into lp:ubuntuone-client/stable-1-4

Commit message

Description of the change

Unmerged revisions

Preview Diff

Subscribers