Merge lp:~ev/apport/quantal into lp:~ubuntu-core-dev/ubuntu/quantal/apport/ubuntu

[Evan]

This change includes the date that Ubuntu was installed on, with each report. As mentioned in the linked bug report, this lets us answer questions that pay particular attention to when a crash occurred relative to installation like, "What is the percentage of systems that have a high initial rate of crashes, which continue submitting crash reports after a week / a month / three months?"

[Martin Pitt (pitti)]

Looks good to me, thanks! (just needs rebasing against the current -proposed version, of course)

review: Approve

=== modified file 'data/general-hooks/ubuntu.py'
--- data/general-hooks/ubuntu.py	2012-09-18 13:01:59 +0000
+++ data/general-hooks/ubuntu.py	2012-10-23 15:26:20 +0000
@@ -291,8 +291,8 @@
 
 def add_release_info(report):
     # https://bugs.launchpad.net/bugs/364649
-    apport.hookutils.attach_file_if_exists(
-        report, '/var/log/installer/media-info', 'InstallationMedia')
+    media = '/var/log/installer/media-info'
+    apport.hookutils.attach_file_if_exists(report, media, 'InstallationMedia')
 
     # if we are running from a live system, add the build timestamp
     apport.hookutils.attach_file_if_exists(
@@ -310,6 +310,12 @@
     else:
         add_tag(report, release_codename)
 
+    if os.path.exists(media):
+        mtime = os.stat(media).st_mtime
+        human_mtime = time.strftime('%Y-%m-%d', time.gmtime(mtime))
+        delta = time.time() - mtime
+        report['InstallationDate'] = 'Installed %s on %s (%d days ago)' % (release_codename, human_mtime, delta / 86400)
+
     log = '/var/log/dist-upgrade/main.log'
     if os.path.exists(log):
         mtime = os.stat(log).st_mtime

=== modified file 'debian/changelog'
--- debian/changelog	2012-10-16 20:35:15 +0000
+++ debian/changelog	2012-10-23 15:26:20 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 apport (2.6.1-0ubuntu4) quantal-proposed; urgency=low
 
   * apport/ui.py: create a MarkForUpload field and set that to false for
@@ -226,6 +227,15 @@
 
  -- Brian Murray <[e-mail]>  Wed, 15 Aug 2012 16:07:34 -0700
 
+=======
+apport (2.4-0ubuntu6.1) UNRELEASED; urgency=low
+
+  * Include the date that Ubuntu was installed with each report
+    (LP: #1070400).
+
+ -- Evan Dandrea <[e-mail]>  Tue, 23 Oct 2012 16:17:44 +0100
+
+>>>>>>> MERGE-SOURCE
 apport (2.4-0ubuntu6) quantal; urgency=low
 
   * debian/control: