Merge lp:~diegosarmentero/ubuntuone-client/farewell-u1-stable into lp:ubuntuone-client/stable-3-0

[Diego Sarmentero]

- Show a message when the client is started indicating that the service will be suspended on June 1st.
- After June 1st, don't contact the server.

Farewell Ubuntu One File Service

[dobey (dobey)]

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~diegosarmentero/ubuntuone-client/farewell-u1-stable into lp:ubuntuone-client/stable-3-0 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.68
checking for automake >= 1.10...
  testing automake-1.11... found 1.11.3
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 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 shell understands some XSI constructs... yes
checking whether the shell und...

[Natalia Bidart (nataliabidart)]

Setting MP as Rejected because is more than 500 days old, and did not have any activity recorded. Change status again if this MP is still current, and please ping someone for review and landing.
Thanks!

Unmerged revisions

1198. By Diego Sarmentero on 2014-04-16

calling show farewell message function

1197. By Diego Sarmentero on 2014-04-16

- Show a message when the client is started indicating that the service will be suspended on June 1st.
- After June 1st, don't contact the server.

=== modified file 'ubuntuone/status/aggregator.py'
--- ubuntuone/status/aggregator.py	2012-04-09 20:07:05 +0000
+++ ubuntuone/status/aggregator.py	2014-04-16 18:20:57 +0000
@@ -49,6 +49,8 @@
 Q_ = lambda string: gettext.dgettext(GETTEXT_PACKAGE, string)
 
 UBUNTUONE_TITLE = Q_("Ubuntu One")
+UBUNTUONE_END = Q_("Ubuntu One file services will be "
+                   "shutting down on June 1st, 2014.\nThanks for your support.")
 NEW_UDFS_SENDER = Q_("New cloud folder(s) available")
 FINAL_COMPLETED = Q_("File synchronization completed.")
 
@@ -805,6 +807,12 @@
         self.notification = self.aggregator.get_notification()
         self.messaging = Messaging()
         self.quota_timer = None
+        self.farewell_ubuntuone_sync()
+
+    def farewell_ubuntuone_sync(self):
+        """Show notification about the upcoming end of UbuntuOne sync."""
+        self.notification.send_notification(
+            UBUNTUONE_TITLE, UBUNTUONE_END)
 
     def file_published(self, public_url):
         """A file was published."""

=== modified file 'ubuntuone/syncdaemon/main.py'
--- ubuntuone/syncdaemon/main.py	2012-04-09 20:08:42 +0000
+++ ubuntuone/syncdaemon/main.py	2014-04-16 18:20:57 +0000
@@ -31,6 +31,7 @@
 import logging
 import os
 import sys
+import datetime
 
 from twisted.internet import defer, reactor, task
 
@@ -106,53 +107,60 @@
         if not throttling_enabled:
             throttling_enabled = user_config.get_throttling()
 
-        self.logger.info("Starting Ubuntu One client version %s",
-                         clientdefs.VERSION)
-        self.logger.info("Using %r as root dir", self.root_dir)
-        self.logger.info("Using %r as data dir", self.data_dir)
-        self.logger.info("Using %r as shares root dir", self.shares_dir)
-        self.db = tritcask.Tritcask(native_path(tritcask_dir))
-        self.vm = volume_manager.VolumeManager(self)
-        self.fs = filesystem_manager.FileSystemManager(
-            data_dir, partials_dir, self.vm, self.db)
-        self.event_q = event_queue.EventQueue(self.fs, ignore_files)
-        self.fs.register_eq(self.event_q)
-
-        # subscribe VM to EQ, to be unsubscribed in shutdown
-        self.event_q.subscribe(self.vm)
-        self.vm.init_root()
-
-        # we don't have the oauth tokens yet, we 'll get them later
-        self.action_q = action_queue.ActionQueue(self.event_q, self,
-                                                 host, port,
-                                                 dns_srv, ssl,
-                                                 disable_ssl_verify,
-                                                 read_limit, write_limit,
-                                                 throttling_enabled)
-        self.hash_q = hash_queue.HashQueue(self.event_q)
-        events_nanny.DownloadFinishedNanny(self.fs, self.event_q, self.hash_q)
-
-        # call StateManager after having AQ
-        self.state_manager = StateManager(self, handshake_timeout)
-
-        self.sync = sync.Sync(self)
-        self.lr = local_rescan.LocalRescan(self.vm, self.fs,
-                                           self.event_q, self.action_q)
-
-        self.external = SyncdaemonService(main=self,
-                                          send_events=broadcast_events)
-        self.external.oauth_credentials = oauth_credentials
-        if user_config.get_autoconnect():
-            self.external.connect(autoconnecting=True)
-
-        self.eventlog_listener = None
-        self.start_event_logger()
-
-        self.status_listener = None
-        self.start_status_listener()
-
-        self.mark = task.LoopingCall(self.log_mark)
-        self.mark.start(mark_interval)
+        end_date = datetime.date(2014, 6, 1)
+        if datetime.date.today() < end_date:
+            self.logger.info("Starting Ubuntu One client version %s",
+                             clientdefs.VERSION)
+            self.logger.info("Using %r as root dir", self.root_dir)
+            self.logger.info("Using %r as data dir", self.data_dir)
+            self.logger.info("Using %r as shares root dir", self.shares_dir)
+            self.db = tritcask.Tritcask(native_path(tritcask_dir))
+            self.vm = volume_manager.VolumeManager(self)
+            self.fs = filesystem_manager.FileSystemManager(
+                data_dir, partials_dir, self.vm, self.db)
+            self.event_q = event_queue.EventQueue(self.fs, ignore_files)
+            self.fs.register_eq(self.event_q)
+
+            # subscribe VM to EQ, to be unsubscribed in shutdown
+            self.event_q.subscribe(self.vm)
+            self.vm.init_root()
+
+            # we don't have the oauth tokens yet, we 'll get them later
+            self.action_q = action_queue.ActionQueue(self.event_q, self,
+                                                     host, port,
+                                                     dns_srv, ssl,
+                                                     disable_ssl_verify,
+                                                     read_limit, write_limit,
+                                                     throttling_enabled)
+            self.hash_q = hash_queue.HashQueue(self.event_q)
+            events_nanny.DownloadFinishedNanny(self.fs, self.event_q,
+                                               self.hash_q)
+
+            # call StateManager after having AQ
+            self.state_manager = StateManager(self, handshake_timeout)
+
+            self.sync = sync.Sync(self)
+            self.lr = local_rescan.LocalRescan(self.vm, self.fs,
+                                               self.event_q, self.action_q)
+
+            self.external = SyncdaemonService(main=self,
+                                              send_events=broadcast_events)
+            self.external.oauth_credentials = oauth_credentials
+            if user_config.get_autoconnect():
+                self.external.connect(autoconnecting=True)
+
+            self.eventlog_listener = None
+            self.start_event_logger()
+
+            self.status_listener = None
+            self.start_status_listener()
+
+            self.mark = task.LoopingCall(self.log_mark)
+            self.mark.start(mark_interval)
+        else:
+            if reactor.running:
+                reactor.stop()
+            sys.exit(0)
 
     def start_event_logger(self):
         """Start the event logger if it's available for this platform."""