Merge lp:~unity-team/unity/trusty-1328677 into lp:unity/7.2

[Stephen M. Webb]

used CONFIG instead of CACHE to store the first_run.stamp

Use CONFIG instead of CACHE to store the first_run.stamp and created a migration script to move the new stamp to the new location (lp: #1328677).

This change is cherry-picked from trunk for SRUing into Ubuntu 14.04 LTS.

Unmerged revisions

=== modified file 'UnityCore/DesktopUtilities.cpp'
--- UnityCore/DesktopUtilities.cpp	2014-04-16 22:17:11 +0000
+++ UnityCore/DesktopUtilities.cpp	2014-12-09 00:11:13 +0000
@@ -66,6 +66,20 @@
   return "";
 }
 
+std::string DesktopUtilities::GetUserConfigDirectory()
+{
+  const char *config_dir = g_get_user_config_dir();
+  auto unity_config = glib::gchar_to_string(config_dir).append(G_DIR_SEPARATOR_S "unity" G_DIR_SEPARATOR_S);
+
+  printf("CONFIG %s\n", unity_config.c_str());
+
+  if (g_mkdir_with_parents(unity_config.c_str(), 0700) >= 0)
+    return unity_config;
+
+  LOG_ERROR(logger) << "Impossible to create unity config folder '"<< unity_config <<"' !";
+  return "";
+}
+
 std::string DesktopUtilities::GetUserRuntimeDirectory()
 {
   const char *runtime_dir = g_get_user_runtime_dir();

=== modified file 'UnityCore/DesktopUtilities.h'
--- UnityCore/DesktopUtilities.h	2014-04-16 22:17:11 +0000
+++ UnityCore/DesktopUtilities.h	2014-12-09 00:11:13 +0000
@@ -32,6 +32,7 @@
   static std::string GetUserDataDirectory();
   static std::string GetUserCacheDirectory();
   static std::string GetUserRuntimeDirectory();
+  static std::string GetUserConfigDirectory();
   static std::vector<std::string> GetSystemDataDirectories();
   static std::vector<std::string> GetDataDirectories();
 

=== modified file 'debian/changelog'
--- debian/changelog	2014-08-26 13:49:00 +0000
+++ debian/changelog	2014-12-09 00:11:13 +0000
@@ -1,3 +1,9 @@
+unity (7.2.3+14.04.20140826-0ubuntu2) UNRELEASED; urgency=medium
+
+  * Use CONFIG instead of CACHE to store the first_run.stamp (lp: #1328677)
+
+ -- Brandon Schaefer <[e-mail]>  Mon, 08 Dec 2014 19:07:01 -0500
+
 unity (7.2.3+14.04.20140826-0ubuntu1) trusty; urgency=medium
 
   [ Andrea Azzarone ]

=== modified file 'debian/unity.migrations'
--- debian/unity.migrations	2014-03-21 02:58:13 +0000
+++ debian/unity.migrations	2014-12-09 00:11:13 +0000
@@ -1,2 +1,3 @@
 tools/migration-scripts/01_unity_change_dconf_path
 tools/migration-scripts/02_unity_setup_text_scale_factor
+tools/migration-scripts/03_unity_first_run_stamp_move

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2014-08-06 14:19:10 +0000
+++ plugins/unityshell/src/unityshell.cpp	2014-12-09 00:11:13 +0000
@@ -4038,8 +4038,8 @@
 void UnityScreen::ShowFirstRunHints()
 {
   sources_.AddTimeoutSeconds(1, [this] {
-    auto const& cache_dir = DesktopUtilities::GetUserCacheDirectory();
-    if (!cache_dir.empty() && !g_file_test((cache_dir+local::FIRST_RUN_STAMP).c_str(), G_FILE_TEST_EXISTS))
+    auto const& config_dir = DesktopUtilities::GetUserConfigDirectory();
+    if (!config_dir.empty() && !g_file_test((config_dir+local::FIRST_RUN_STAMP).c_str(), G_FILE_TEST_EXISTS))
     {
       // We focus the panel, so the shortcut hint will be hidden at first user input
       auto const& panels = panel_controller_->panels();
@@ -4052,7 +4052,7 @@
       shortcut_controller_->Show();
 
       glib::Error error;
-      g_file_set_contents((cache_dir+local::FIRST_RUN_STAMP).c_str(), "", 0, &error);
+      g_file_set_contents((config_dir+local::FIRST_RUN_STAMP).c_str(), "", 0, &error);
 
       if (error)
       {

=== added file 'tools/migration-scripts/03_unity_first_run_stamp_move'
--- tools/migration-scripts/03_unity_first_run_stamp_move	1970-01-01 00:00:00 +0000
+++ tools/migration-scripts/03_unity_first_run_stamp_move	2014-12-09 00:11:13 +0000
@@ -0,0 +1,35 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+# Copyright (C) 2014 Canonical
+#
+# Authors:
+#  Brandon Schaefer <[e-mail]>
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; version 3.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUTa
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+# details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+from gi.repository import GLib
+from os import path, rename, mkdir
+
+old_first_run_path = GLib.get_user_cache_dir()  + "/unity/first_run.stamp"
+new_first_run_path = GLib.get_user_config_dir() + "/unity"
+
+# If we have the old first_run.stamp file, we must move it to the new location
+if path.isfile(old_first_run_path):
+
+  # make sure the new dir exists before attempting to move
+  if not path.isdir(new_first_run_path):
+    mkdir(new_first_run_path)
+
+  new_first_run_path += "/first_run.stamp"
+  rename(old_first_run_path, new_first_run_path)