Merge lp:~ubuntuone-control-tower/ubuntu/lucid/ubuntuone-client/trunk into lp:ubuntu/lucid/ubuntuone-client

[dobey]

[lp:~ubuntuone-control-tower/ubuntu/lucid/ubuntuone-client/trunk]

26. By Sebastien Bacher on 2010-04-01

releasing version 1.1.91-0ubuntu1

=== modified file 'bin/ubuntuone-preferences'
--- bin/ubuntuone-preferences	2010-03-31 23:46:58 +0000
+++ bin/ubuntuone-preferences	2010-04-01 20:36:38 +0000
@@ -210,8 +210,8 @@
         self.status_label = gtk.Label("")
         self.attach(self.status_label, 0, 3, 2, 3)
 
-        self.description = gtk.Label(_("The devices connected with your"
-                                       " pseronal cloud network"
+        self.description = gtk.Label(_("The devices connected to with your"
+                                       " personal cloud network"
                                        " are listed below"))
         self.description.set_alignment(0., .5)
         self.description.set_line_wrap(True)
@@ -597,7 +597,7 @@
         """Handle the dialog's response."""
         self.hide()
         self.devices.handle_bw_controls_changed()
-        gtk.main_quit()
+        gobject.timeout_add_seconds(5, gtk.main_quit)
 
     def _format_for_gb_display(self, bytes):
         """Format bytes into reasonable gb display."""
@@ -957,6 +957,7 @@
         sw.show()
         self.devices = DevicesWidget(self.__bus, self.keyring)
         sw.add_with_viewport(self.devices)
+        self.devices.list_devices()
         self.devices.show_all()
 
         # Services tab
@@ -1058,7 +1059,8 @@
         self.dialog.request_quota_info()
         self.dialog.request_account_info()
         self.dialog.devices.get_devices()
-        self.dialog.present_with_time(int(time.time()))
+        if self.dialog.visible:
+            self.dialog.present_with_time(int(time.time()))
 
     def got_newcredentials(self, realm, consumer_key):
         """Show our dialog, since we can do stuff now."""

=== modified file 'configure'
--- configure	2010-03-31 23:46:58 +0000
+++ configure	2010-04-01 20:36:38 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.65 for ubuntuone-client 1.1.90.
+# Generated by GNU Autoconf 2.65 for ubuntuone-client 1.1.91.
 #
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -698,8 +698,8 @@
 # Identity of this package.
 PACKAGE_NAME='ubuntuone-client'
 PACKAGE_TARNAME='ubuntuone-client'
-PACKAGE_VERSION='1.1.90'
-PACKAGE_STRING='ubuntuone-client 1.1.90'
+PACKAGE_VERSION='1.1.91'
+PACKAGE_STRING='ubuntuone-client 1.1.91'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1476,7 +1476,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures ubuntuone-client 1.1.90 to adapt to many kinds of systems.
+\`configure' configures ubuntuone-client 1.1.91 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1547,7 +1547,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of ubuntuone-client 1.1.90:";;
+     short | recursive ) echo "Configuration of ubuntuone-client 1.1.91:";;
    esac
   cat <<\_ACEOF
 
@@ -1660,7 +1660,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-ubuntuone-client configure 1.1.90
+ubuntuone-client configure 1.1.91
 generated by GNU Autoconf 2.65
 
 Copyright (C) 2009 Free Software Foundation, Inc.
@@ -1938,7 +1938,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by ubuntuone-client $as_me 1.1.90, which was
+It was created by ubuntuone-client $as_me 1.1.91, which was
 generated by GNU Autoconf 2.65.  Invocation command line was
 
   $ $0 $@
@@ -2748,7 +2748,7 @@
 
 # Define the identity of the package.
  PACKAGE='ubuntuone-client'
- VERSION='1.1.90'
+ VERSION='1.1.91'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -12972,7 +12972,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by ubuntuone-client $as_me 1.1.90, which was
+This file was extended by ubuntuone-client $as_me 1.1.91, which was
 generated by GNU Autoconf 2.65.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -13038,7 +13038,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-ubuntuone-client config.status 1.1.90
+ubuntuone-client config.status 1.1.91
 configured by $0, generated by GNU Autoconf 2.65,
   with options \\"\$ac_cs_config\\"
 

=== modified file 'configure.ac'
--- configure.ac	2010-03-31 23:46:58 +0000
+++ configure.ac	2010-04-01 20:36:38 +0000
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.53)
 
-AC_INIT([ubuntuone-client], [1.1.90])
+AC_INIT([ubuntuone-client], [1.1.91])
 AC_CONFIG_SRCDIR([config.h.in])
 
 AM_INIT_AUTOMAKE([1.10 foreign])

=== modified file 'contrib/__init__.pyc'
Binary files contrib/__init__.pyc	2010-03-31 23:46:58 +0000 and contrib/__init__.pyc	2010-04-01 20:36:38 +0000 differ
=== modified file 'contrib/dbus_util.pyc'
Binary files contrib/dbus_util.pyc	2010-03-31 23:46:58 +0000 and contrib/dbus_util.pyc	2010-04-01 20:36:38 +0000 differ
=== modified file 'contrib/mocker.pyc'
Binary files contrib/mocker.pyc	2010-03-31 23:46:58 +0000 and contrib/mocker.pyc	2010-04-01 20:36:38 +0000 differ
=== modified file 'contrib/testing/__init__.pyc'
Binary files contrib/testing/__init__.pyc	2010-03-31 23:46:58 +0000 and contrib/testing/__init__.pyc	2010-04-01 20:36:38 +0000 differ
=== modified file 'contrib/testing/testcase.pyc'
Binary files contrib/testing/testcase.pyc	2010-03-31 23:46:58 +0000 and contrib/testing/testcase.pyc	2010-04-01 20:36:38 +0000 differ
=== modified file 'debian/changelog'
--- debian/changelog	2010-04-01 00:03:14 +0000
+++ debian/changelog	2010-04-01 20:36:38 +0000
@@ -1,3 +1,12 @@
+ubuntuone-client (1.1.91-0ubuntu1) UNRELEASED; urgency=low
+
+  * New upstream release.
+    - Fix to avoid AttributeError on exit (LP: #553318)
+    - Fix typo and string change in prefs app (LP: #553324)
+    - Add missing autostart files to packages (LP: #534707)
+
+ -- Rodney Dawes <[e-mail]>  Thu, 01 Apr 2010 16:17:17 -0400
+
 ubuntuone-client (1.1.90-0ubuntu1) lucid; urgency=low
 
   * New upstream release.

=== modified file 'debian/ubuntuone-client.install'
--- debian/ubuntuone-client.install	2010-02-18 00:08:41 +0000
+++ debian/ubuntuone-client.install	2010-04-01 20:36:38 +0000
@@ -1,5 +1,7 @@
+debian/tmp/etc/xdg/autostart
 debian/tmp/usr/lib/ubuntuone-client/ubuntuone-syncdaemon
 debian/tmp/usr/bin/u1sdtool
+debian/tmp/usr/bin/ubuntuone-launch
 debian/tmp/usr/share/dbus-1/services/com.ubuntuone.SyncDaemon.service
 debian/tmp/usr/share/man/man1/u1sdtool.*
 debian/tmp/usr/share/locale

=== modified file 'tests/__init__.pyc'
Binary files tests/__init__.pyc	2010-03-31 23:46:58 +0000 and tests/__init__.pyc	2010-04-01 20:36:38 +0000 differ
=== modified file 'tests/oauthdesktop/__init__.pyc'
Binary files tests/oauthdesktop/__init__.pyc	2010-03-31 23:46:58 +0000 and tests/oauthdesktop/__init__.pyc	2010-04-01 20:36:38 +0000 differ
=== modified file 'tests/oauthdesktop/test_auth.pyc'
Binary files tests/oauthdesktop/test_auth.pyc	2010-03-31 23:46:58 +0000 and tests/oauthdesktop/test_auth.pyc	2010-04-01 20:36:38 +0000 differ
=== modified file 'tests/oauthdesktop/test_config.pyc'
Binary files tests/oauthdesktop/test_config.pyc	2010-03-31 23:46:58 +0000 and tests/oauthdesktop/test_config.pyc	2010-04-01 20:36:38 +0000 differ
=== modified file 'tests/oauthdesktop/test_key_acls.pyc'
Binary files tests/oauthdesktop/test_key_acls.pyc	2010-03-31 23:46:58 +0000 and tests/oauthdesktop/test_key_acls.pyc	2010-04-01 20:36:38 +0000 differ
=== modified file 'tests/oauthdesktop/test_main.pyc'
Binary files tests/oauthdesktop/test_main.pyc	2010-03-31 23:46:58 +0000 and tests/oauthdesktop/test_main.pyc	2010-04-01 20:36:38 +0000 differ
=== modified file 'tests/syncdaemon/__init__.pyc'
Binary files tests/syncdaemon/__init__.pyc	2010-03-31 23:46:58 +0000 and tests/syncdaemon/__init__.pyc	2010-04-01 20:36:38 +0000 differ
=== modified file 'tests/syncdaemon/fsm/__init__.pyc'
Binary files tests/syncdaemon/fsm/__init__.pyc	2010-03-31 23:46:58 +0000 and tests/syncdaemon/fsm/__init__.pyc	2010-04-01 20:36:38 +0000 differ
=== modified file 'tests/syncdaemon/fsm/test_fsm.pyc'
Binary files tests/syncdaemon/fsm/test_fsm.pyc	2010-03-31 23:46:58 +0000 and tests/syncdaemon/fsm/test_fsm.pyc	2010-04-01 20:36:38 +0000 differ
=== modified file 'tests/syncdaemon/fsm/test_fsm_run.pyc'
Binary files tests/syncdaemon/fsm/test_fsm_run.pyc	2010-03-31 23:46:58 +0000 and tests/syncdaemon/fsm/test_fsm_run.pyc	2010-04-01 20:36:38 +0000 differ
=== modified file 'tests/syncdaemon/fsm/test_run_hello.pyc'
Binary files tests/syncdaemon/fsm/test_run_hello.pyc	2010-03-31 23:46:58 +0000 and tests/syncdaemon/fsm/test_run_hello.pyc	2010-04-01 20:36:38 +0000 differ
=== modified file 'tests/syncdaemon/test_action_predicates.pyc'
Binary files tests/syncdaemon/test_action_predicates.pyc	2010-03-31 23:46:58 +0000 and tests/syncdaemon/test_action_predicates.pyc	2010-04-01 20:36:38 +0000 differ
=== modified file 'tests/syncdaemon/test_action_queue.pyc'
Binary files tests/syncdaemon/test_action_queue.pyc	2010-03-31 23:46:58 +0000 and tests/syncdaemon/test_action_queue.pyc	2010-04-01 20:36:38 +0000 differ
=== modified file 'tests/syncdaemon/test_config.pyc'
Binary files tests/syncdaemon/test_config.pyc	2010-03-31 23:46:58 +0000 and tests/syncdaemon/test_config.pyc	2010-04-01 20:36:38 +0000 differ
=== modified file 'tests/syncdaemon/test_dbus.pyc'
Binary files tests/syncdaemon/test_dbus.pyc	2010-03-31 23:46:58 +0000 and tests/syncdaemon/test_dbus.pyc	2010-04-01 20:36:38 +0000 differ
=== modified file 'tests/syncdaemon/test_eq_inotify.pyc'
Binary files tests/syncdaemon/test_eq_inotify.pyc	2010-03-31 23:46:58 +0000 and tests/syncdaemon/test_eq_inotify.pyc	2010-04-01 20:36:38 +0000 differ
=== modified file 'tests/syncdaemon/test_eventqueue.pyc'
Binary files tests/syncdaemon/test_eventqueue.pyc	2010-03-31 23:46:58 +0000 and tests/syncdaemon/test_eventqueue.pyc	2010-04-01 20:36:38 +0000 differ
=== modified file 'tests/syncdaemon/test_eventsnanny.pyc'
Binary files tests/syncdaemon/test_eventsnanny.pyc	2010-03-31 23:46:58 +0000 and tests/syncdaemon/test_eventsnanny.pyc	2010-04-01 20:36:38 +0000 differ
=== modified file 'tests/syncdaemon/test_fileshelf.pyc'
Binary files tests/syncdaemon/test_fileshelf.pyc	2010-03-31 23:46:58 +0000 and tests/syncdaemon/test_fileshelf.pyc	2010-04-01 20:36:38 +0000 differ
=== modified file 'tests/syncdaemon/test_fsm.pyc'
Binary files tests/syncdaemon/test_fsm.pyc	2010-03-31 23:46:58 +0000 and tests/syncdaemon/test_fsm.pyc	2010-04-01 20:36:38 +0000 differ
=== modified file 'tests/syncdaemon/test_hashqueue.pyc'
Binary files tests/syncdaemon/test_hashqueue.pyc	2010-03-31 23:46:58 +0000 and tests/syncdaemon/test_hashqueue.pyc	2010-04-01 20:36:38 +0000 differ
=== modified file 'tests/syncdaemon/test_localrescan.pyc'
Binary files tests/syncdaemon/test_localrescan.pyc	2010-03-31 23:46:58 +0000 and tests/syncdaemon/test_localrescan.pyc	2010-04-01 20:36:38 +0000 differ
=== modified file 'tests/syncdaemon/test_logger.pyc'
Binary files tests/syncdaemon/test_logger.pyc	2010-03-31 23:46:58 +0000 and tests/syncdaemon/test_logger.pyc	2010-04-01 20:36:38 +0000 differ
=== modified file 'tests/syncdaemon/test_main.pyc'
Binary files tests/syncdaemon/test_main.pyc	2010-03-31 23:46:58 +0000 and tests/syncdaemon/test_main.pyc	2010-04-01 20:36:38 +0000 differ
=== modified file 'tests/syncdaemon/test_states.pyc'
Binary files tests/syncdaemon/test_states.pyc	2010-03-31 23:46:58 +0000 and tests/syncdaemon/test_states.pyc	2010-04-01 20:36:38 +0000 differ
=== modified file 'tests/syncdaemon/test_sync.pyc'
Binary files tests/syncdaemon/test_sync.pyc	2010-03-31 23:46:58 +0000 and tests/syncdaemon/test_sync.pyc	2010-04-01 20:36:38 +0000 differ
=== modified file 'tests/syncdaemon/test_tools.pyc'
Binary files tests/syncdaemon/test_tools.pyc	2010-03-31 23:46:58 +0000 and tests/syncdaemon/test_tools.pyc	2010-04-01 20:36:38 +0000 differ
=== modified file 'tests/syncdaemon/test_u1fsfsm.pyc'
Binary files tests/syncdaemon/test_u1fsfsm.pyc	2010-03-31 23:46:58 +0000 and tests/syncdaemon/test_u1fsfsm.pyc	2010-04-01 20:36:38 +0000 differ
=== modified file 'tests/syncdaemon/test_u1sdtool.pyc'
Binary files tests/syncdaemon/test_u1sdtool.pyc	2010-03-31 23:46:58 +0000 and tests/syncdaemon/test_u1sdtool.pyc	2010-04-01 20:36:38 +0000 differ
=== modified file 'tests/syncdaemon/test_vm.py'
--- tests/syncdaemon/test_vm.py	2010-03-31 23:46:58 +0000
+++ tests/syncdaemon/test_vm.py	2010-04-01 20:36:38 +0000
@@ -1707,6 +1707,57 @@
         self.assertEquals(30, self.vm.get_free_space(udf.volume_id))
         self.assertEquals(30, self.vm.get_free_space(root.volume_id))
 
+    @defer.inlineCallbacks
+    def test_UDF_cant_be_a_symlink(self):
+        """Test that a UDF can't be a symlink."""
+        # initialize the root
+        self.vm.handle_SYS_ROOT_RECEIVED('root_uuid')
+        real_udf_path = os.path.join(self.home_dir, "my_udf")
+        udf_path = os.path.join(self.home_dir, "MyUDF")
+        # patch FakeAQ
+        def create_udf(path, name, marker):
+            """Fake create_udf"""
+            self.main.event_q.push("AQ_CREATE_UDF_OK", **dict(volume_id=uuid.uuid4(),
+                                                       node_id=uuid.uuid4(),
+                                                       marker=marker))
+        self.main.action_q.create_udf = create_udf
+        # create the symlink
+        os.makedirs(real_udf_path)
+        os.symlink(real_udf_path, udf_path)
+        d = defer.Deferred()
+        self._listen_for('VM_UDF_CREATE_ERROR', d.callback)
+        self._listen_for('VM_UDF_CREATED', lambda r: d.errback(Exception(r)))
+        self.vm.create_udf(udf_path)
+        result = yield d
+        self.assertEquals(0, len(list(self.vm.udfs.keys())))
+        self.assertEquals(result[0], udf_path)
+        self.assertEquals(result[1], "UDFs can not be a symlink")
+
+    @defer.inlineCallbacks
+    def test_UDF_cant_be_inside_symlink(self):
+        """Test that a UDF can't be inside a symlink."""
+        # initialize the root
+        self.vm.handle_SYS_ROOT_RECEIVED('root_uuid')
+        real_udf_path = os.path.join(self.home_dir, "udf_parent", "my_udf")
+        udf_path = os.path.join(self.home_dir, "MyUDF")
+        # patch FakeAQ
+        def create_udf(path, name, marker):
+            """Fake create_udf"""
+            self.main.event_q.push("AQ_CREATE_UDF_OK", **dict(volume_id=uuid.uuid4(),
+                                                       node_id=uuid.uuid4(),
+                                                       marker=marker))
+        self.main.action_q.create_udf = create_udf
+        # create the symlink
+        os.makedirs(real_udf_path)
+        os.symlink(real_udf_path, udf_path)
+        d = defer.Deferred()
+        self._listen_for('VM_UDF_CREATE_ERROR', d.callback)
+        self._listen_for('VM_UDF_CREATED', lambda r: d.errback(Exception(r)))
+        self.vm.create_udf(udf_path)
+        result = yield d
+        self.assertEquals(0, len(list(self.vm.udfs.keys())))
+        self.assertEquals(result[0], udf_path)
+        self.assertEquals(result[1], "UDFs can not be a symlink")
 
 class MetadataTestCase(BaseTwistedTestCase):
     md_version_None = False

=== modified file 'tests/syncdaemon/test_vm.pyc'
Binary files tests/syncdaemon/test_vm.pyc	2010-03-31 23:46:58 +0000 and tests/syncdaemon/test_vm.pyc	2010-04-01 20:36:38 +0000 differ
=== modified file 'tests/test_login.pyc'
Binary files tests/test_login.pyc	2010-03-31 23:46:58 +0000 and tests/test_login.pyc	2010-04-01 20:36:38 +0000 differ
=== modified file 'tests/test_preferences.pyc'
Binary files tests/test_preferences.pyc	2010-03-31 23:46:58 +0000 and tests/test_preferences.pyc	2010-04-01 20:36:38 +0000 differ
=== modified file 'tests/u1sync/__init__.pyc'
Binary files tests/u1sync/__init__.pyc	2010-03-31 23:46:58 +0000 and tests/u1sync/__init__.pyc	2010-04-01 20:36:38 +0000 differ
=== modified file 'tests/u1sync/test_init.pyc'
Binary files tests/u1sync/test_init.pyc	2010-03-31 23:46:58 +0000 and tests/u1sync/test_init.pyc	2010-04-01 20:36:38 +0000 differ
=== modified file 'tests/u1sync/test_merge.pyc'
Binary files tests/u1sync/test_merge.pyc	2010-03-31 23:46:58 +0000 and tests/u1sync/test_merge.pyc	2010-04-01 20:36:38 +0000 differ
=== modified file 'ubuntuone/syncdaemon/volume_manager.py'
--- ubuntuone/syncdaemon/volume_manager.py	2010-03-31 23:46:58 +0000
+++ ubuntuone/syncdaemon/volume_manager.py	2010-04-01 20:36:38 +0000
@@ -840,8 +840,13 @@
     def create_udf(self, path):
         """Request the creation of a UDF to AQ."""
         self.log.debug('create udf: %r', path)
-        # check if the path it's ok (outside root and isn't a ancestor or
-        # child of another UDF)
+        # check if path is the realpath, bail out if not
+        if os.path.realpath(path) != path:
+            self.m.event_q.push('VM_UDF_CREATE_ERROR', path,
+                                "UDFs can not be a symlink")
+            return
+        # check if the path it's ok (outside root and
+        # isn't a ancestor or child of another UDF)
         if self._is_nested_udf(path):
             self.m.event_q.push('VM_UDF_CREATE_ERROR', path,
                                 "UDFs can not be nested")