Merge lp:~laney/whoopsie-preferences/mkdir into lp:whoopsie-preferences

[Iain Lane]

Creating a file when it's parent directory doesn't exist is bad.

Try to make /var/lib/apport/ here before making a file in it. This works because we're run as root.

[Iain Lane (laney)]

I also imported the archive upload to the branch, as it seems that was uploaded directly (which meant that the staged change was lost, too)

[lp:~laney/whoopsie-preferences/mkdir]

52. By Iain Lane on 2014-04-01

Bump version in configure.ac

[Evan (ev)]

Looks sensible. +1

review: Approve

[lp:~laney/whoopsie-preferences/mkdir]

53. By Iain Lane on 2014-04-02

releasing package whoopsie-preferences version 0.11

[Iain Lane (laney)]

Thanks. I uploaded and pushed a tag to this branch—please could you merge it?

=== modified file 'configure.ac'
--- configure.ac	2013-07-29 13:54:45 +0000
+++ configure.ac	2014-04-02 09:51:26 +0000
@@ -1,5 +1,5 @@
 AC_INIT([whoopsie-preferences], 
-        [0.10], 
+        [0.11], 
         [http://launchpad.net/whoopsie-preferences])
 
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])

=== modified file 'debian/changelog'
--- debian/changelog	2013-07-29 13:52:59 +0000
+++ debian/changelog	2014-04-02 09:51:26 +0000
@@ -1,9 +1,21 @@
-whoopsie-preferences (0.10) UNRELEASED; urgency=low
+whoopsie-preferences (0.11) trusty; urgency=low
 
+  [ Evan Dandrea ]
   * Signal to policykit that we'd like a password dialog, if one is
     needed.
 
- -- Evan Dandrea <[e-mail]>  Mon, 29 Jul 2013 14:52:42 +0100
+  [ Iain Lane ]
+  * Try to create /var/lib/apport/ to avoid crashing when we attempt to access
+    a file in there. (LP: #1289097)
+
+ -- Iain Lane <[e-mail]>  Wed, 02 Apr 2014 10:50:18 +0100
+
+whoopsie-preferences (0.10) trusty; urgency=low
+
+  * Change location of file indicating that automatic crash reporting is
+    enabled.  (LP: #1239811)
+
+ -- Brian Murray <[e-mail]>  Mon, 06 Jan 2014 12:11:36 -0800
 
 whoopsie-preferences (0.9) saucy; urgency=low
 

=== modified file 'src/whoopsie-preferences.c'
--- src/whoopsie-preferences.c	2013-07-29 13:52:59 +0000
+++ src/whoopsie-preferences.c	2014-04-02 09:51:26 +0000
@@ -113,7 +113,7 @@
 autoreport_file_changed (GFileMonitor* monitor, GFile* file, GFile* other_file, GFileMonitorEvent event_type, gpointer user_data)
 {
     WhoopsiePreferences* interface = user_data;
-    if (access ("/etc/apport/autoreport", F_OK) != -1) {
+    if (access ("/var/lib/apport/autoreport", F_OK) != -1) {
         whoopsie_preferences_set_automatically_report_crashes (interface, TRUE);
     } else {
         whoopsie_preferences_set_automatically_report_crashes (interface, FALSE);
@@ -128,11 +128,11 @@
     GError* err = NULL;
     GFileMonitor* monitor = NULL;
 
-    path = g_file_new_for_path ("/etc/apport/autoreport");
+    path = g_file_new_for_path ("/var/lib/apport/autoreport");
     monitor = g_file_monitor_file (path, G_FILE_MONITOR_NONE, NULL, &err);
     g_object_unref (path);
     if (err) {
-        g_print ("Unable to monitor /etc/apport/autoreport: %s", err->message);
+        g_print ("Unable to monitor /var/lib/apport/autoreport: %s", err->message);
         g_error_free (err);
     } else {
         g_signal_connect (monitor, "changed", G_CALLBACK (autoreport_file_changed), iface);
@@ -191,12 +191,13 @@
     /* I'm aware this is usually a race, but it's really just to guard against
      * writing the file when it already exists. */
     if (iface->get_automatically_report_crashes (object)) {
-        if (access ("/etc/apport/autoreport", F_OK) < 0) {
-            fclose (fopen ("/etc/apport/autoreport", "w"));
+        if (g_mkdir_with_parents("/var/lib/apport/", 0755) && 
+                (access ("/var/lib/apport/autoreport", F_OK) < 0)) {
+            fclose (fopen ("/var/lib/apport/autoreport", "w"));
         }
     } else {
-        if (access ("/etc/apport/autoreport", F_OK) != -1) {
-            unlink ("/etc/apport/autoreport");
+        if (access ("/var/lib/apport/autoreport", F_OK) != -1) {
+            unlink ("/var/lib/apport/autoreport");
         }
     }