Merge lp:~rye/ubuntuone-client/uniqueinterfaceless into lp:ubuntuone-client

Proposed by Roman Yepishev
Status: Merged
Approved by: Natalia Bidart
Approved revision: 791
Merged at revision: 801
Proposed branch: lp:~rye/ubuntuone-client/uniqueinterfaceless
Merge into: lp:ubuntuone-client
Diff against target: 24 lines (+1/-2)
2 files modified
bin/ubuntuone-syncdaemon (+1/-1)
ubuntuone/platform/linux/dbus_interface.py (+0/-1)
To merge this branch: bzr merge lp:~rye/ubuntuone-client/uniqueinterfaceless
Reviewer Review Type Date Requested Status
John Lenton (community) Approve
Natalia Bidart (community) fieldtest Approve
Review via email: mp+45376@code.launchpad.net

Commit message

Remove SyncDaemon.UniqueInterface since it is no longer needed with tritcask metadata storage.

Description of the change

Remove .UniqueInterface from SyncDaemon that was used to prevent nautilus extension from hanging nautilus process on syncdaemon startup. It was used only in syncdaemon and was not a long term solution anyway.

To test:
1. Run ubuntuone-syncdaemon from the branch
2. start d-feet and you should be able to see only one interface starting with "com.ubuntuone.SyncDaemon".
3. Try running ubuntoune-syncdaemon from the branch again in another terminal. It will report "Another instance is running"

To post a comment you must log in.
Revision history for this message
Natalia Bidart (nataliabidart) wrote :

Awesome!

review: Approve (fieldtest)
Revision history for this message
John Lenton (chipaca) wrote :

So long, UniqueInstance. You will not be missed.

review: Approve
Revision history for this message
Natalia Bidart (nataliabidart) wrote :
Download full text (179.6 KiB)

The attempt to merge lp:~rye/ubuntuone-client/uniqueinterfaceless into lp:ubuntuone-client failed. Below is the output from the failed tests.

/usr/bin/gnome-autogen.sh
checking for autoconf >= 2.53...
(B testing autoconf2.50... not found.
  testing autoconf... found 2.67
checking for automake >= 1.10...
(B testing automake-1.11... found 1.11.1
checking for libtool >= 1.5...
(B testing libtoolize... found 2.2.6b
checking for intltool >= 0.30...
(B testing intltoolize... found 0.41.1
checking for pkg-config >= 0.14.0...
(B testing pkg-config... found 0.25
checking for gtk-doc >= 1.0...
(B testing gtkdocize... found 1.15
Checking for required M4 macros...
(BChecking for forbidden M4 macros...
(BProcessing ./configure.ac
(BRunning libtoolize...
(Blibtoolize: 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...
(BRunning gtkdocize...
(BRunning aclocal-1.11...
(BRunning autoconf...
(BRunning autoheader...
(BRunning automake-1.11...
(BRunning ./configure --enable-gtk-doc --with-protocol=~/canonical/ubuntuone-storage-protocol/trunk/ ...
(Bchecking 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 unders...

Revision history for this message
Natalia Bidart (nataliabidart) wrote :
Download full text (180.4 KiB)

The attempt to merge lp:~rye/ubuntuone-client/uniqueinterfaceless into lp:ubuntuone-client failed. Below is the output from the failed tests.

/usr/bin/gnome-autogen.sh
checking for autoconf >= 2.53...
(B testing autoconf2.50... not found.
  testing autoconf... found 2.67
checking for automake >= 1.10...
(B testing automake-1.11... found 1.11.1
checking for libtool >= 1.5...
(B testing libtoolize... found 2.2.6b
checking for intltool >= 0.30...
(B testing intltoolize... found 0.41.1
checking for pkg-config >= 0.14.0...
(B testing pkg-config... found 0.25
checking for gtk-doc >= 1.0...
(B testing gtkdocize... found 1.15
Checking for required M4 macros...
(BChecking for forbidden M4 macros...
(BProcessing ./configure.ac
(BRunning libtoolize...
(Blibtoolize: 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...
(BRunning gtkdocize...
(BRunning aclocal-1.11...
(BRunning autoconf...
(BRunning autoheader...
(BRunning automake-1.11...
(BRunning ./configure --enable-gtk-doc --enable-debug --with-protocol=~/canonical/ubuntuone-storage-protocol/trunk/ ...
(Bchecking 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 t...

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/ubuntuone-syncdaemon'
2--- bin/ubuntuone-syncdaemon 2010-12-01 14:07:36 +0000
3+++ bin/ubuntuone-syncdaemon 2011-01-06 14:03:52 +0000
4@@ -50,7 +50,7 @@
5 def is_already_running():
6 """ check if there is another instance registered in DBus """
7 bus = dbus.SessionBus()
8- request = bus.request_name(dbus_interface.DBUS_IFACE_UNIQUE_NAME,
9+ request = bus.request_name(dbus_interface.DBUS_IFACE_NAME,
10 dbus.bus.NAME_FLAG_DO_NOT_QUEUE)
11 return request == dbus.bus.REQUEST_NAME_REPLY_EXISTS
12
13
14=== modified file 'ubuntuone/platform/linux/dbus_interface.py'
15--- ubuntuone/platform/linux/dbus_interface.py 2010-12-16 19:50:38 +0000
16+++ ubuntuone/platform/linux/dbus_interface.py 2011-01-06 14:03:52 +0000
17@@ -39,7 +39,6 @@
18 # pylint: disable-msg=C0103
19
20 DBUS_IFACE_NAME = 'com.ubuntuone.SyncDaemon'
21-DBUS_IFACE_UNIQUE_NAME = DBUS_IFACE_NAME + '.UniqueInstance'
22 DBUS_IFACE_SYNC_NAME = DBUS_IFACE_NAME + '.SyncDaemon'
23 DBUS_IFACE_STATUS_NAME = DBUS_IFACE_NAME+'.Status'
24 DBUS_IFACE_EVENTS_NAME = DBUS_IFACE_NAME+'.Events'

Subscribers

People subscribed via source and target branches