usb-creator-hackers team mailing list archive

[Dmitrijs Ledkovs <dmitrij.ledkov@xxxxxxxxx>]

Dmitrijs Ledkovs has proposed merging lp:~dmitrij.ledkov/usb-creator/xdg into lp:usb-creator.

Requested reviews:
  usb-creator hackers (usb-creator-hackers)


This branch finishes work started in lp:~cristiklein/usb-creator/use-xdg

The log file is moved from ~/.usbcreator.log to ~/.cache/usb-creator.log which follow XDG basedir spec. Other ubuntu apps use it as well, e.g. ~/.cache/indicator-applet.log ~/.cache/indicator-applet-session.log
-- 
https://code.launchpad.net/~dmitrij.ledkov/usb-creator/xdg/+merge/25530
Your team usb-creator hackers is requested to review the proposed merge of lp:~dmitrij.ledkov/usb-creator/xdg into lp:usb-creator.

=== modified file 'debian/changelog'
--- debian/changelog	2010-05-18 14:51:17 +0000
+++ debian/changelog	2010-05-18 16:15:41 +0000
@@ -34,6 +34,8 @@
   * .bzr-builddeb:
     + defaults to native
 
+  * Use XDG_CACHE_DIR for usb-creator.log
+
  -- Dmitrijs Ledkovs <dmitrij.ledkov@xxxxxxxxxx>  Mon, 03 May 2010 04:22:28 +0000
 
 usb-creator (0.2.22) lucid; urgency=low

=== modified file 'debian/source_usb-creator.py'
--- debian/source_usb-creator.py	2010-03-05 00:53:00 +0000
+++ debian/source_usb-creator.py	2010-05-18 16:15:41 +0000
@@ -5,10 +5,12 @@
 '''
 
 from apport.hookutils import *
-from os import path
+from os import path, getenv
 
 def add_info(report):
-    
-    attach_file_if_exists(report, path.expanduser('~/.usbcreator.log'), 'UsbCreatorLog')
+
+    cache_dir = getenv('XDG_CACHE_HOME', path.expanduser('~/.cache'))
+    log_file = path.join(cache_dir, 'usb-creator.log')
+    attach_file_if_exists(report, log_file, 'UsbCreatorLog')
 
     report['UsbDevices'] = usb_devices()

=== modified file 'gui/usbcreator-gtk.ui'
--- gui/usbcreator-gtk.ui	2010-04-06 14:05:41 +0000
+++ gui/usbcreator-gtk.ui	2010-05-18 16:15:41 +0000
@@ -735,7 +735,7 @@
                       <object class="GtkLabel" id="failed_dialog_label">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="label" translatable="yes">The installation failed.  Please see ~/.usbcreator.log for more details.
+                        <property name="label" translatable="yes">The installation failed.  Please see ~/.cache/usb-creator.log for more details.
 </property>
                         <property name="wrap">True</property>
                         <property name="selectable">True</property>

=== modified file 'man/usb-creator-gtk.8'
--- man/usb-creator-gtk.8	2010-05-18 14:42:29 +0000
+++ man/usb-creator-gtk.8	2010-05-18 16:15:41 +0000
@@ -52,7 +52,7 @@
 Report bugs via Ubuntu Launchpad <https://launchpad.net/ubuntu/+source/usb\-creator/+filebug>
 .PP
 When reporting bugs, please be sure to include a copy of the usb\-creator log file
-to assist in debugging. This log file can be found as ~/.usbcreator.log.
+to assist in debugging. This log file can be found as ~/.cache/usb-creator.log.
 .SH COPYRIGHT
 Copyright \(co 2009\-2010 Evan Dandrea
 .br

=== modified file 'man/usb-creator-kde.8'
--- man/usb-creator-kde.8	2010-05-03 03:16:08 +0000
+++ man/usb-creator-kde.8	2010-05-18 16:15:41 +0000
@@ -48,7 +48,7 @@
 Report bugs via Ubuntu Launchpad <https://launchpad.net/ubuntu/+source/usb-creator/+filebug>
 .PP
 When reporting bugs, please be sure to include a copy of the usb-creator log file
-to assist in debugging. This log file can be found as ~/.usbcreator.log.
+to assist in debugging. This log file can be found as ~/.cache/usb-creator.log.
 .SH COPYRIGHT
 Copyright \(co 2009-2010 Roderick B. Greening
 .br

=== modified file 'usbcreator/misc.py'
--- usbcreator/misc.py	2009-10-13 09:53:07 +0000
+++ usbcreator/misc.py	2010-05-18 16:15:41 +0000
@@ -39,9 +39,10 @@
 def setup_logging():
     log = logging.getLogger('')
     # usb-creator used to write ~/.usb-creator.log as root (whoops!), so lets
-    # use a different name here.
-    log_dir = os.path.expanduser('~')
-    log_file = os.path.join(log_dir, '.usbcreator.log')
+    # use a different name here. -- ev
+    # new location so let's go back to original name =) -- xnox
+    cache_dir = os.getenv('XDG_CACHE_HOME', os.path.expanduser('~/.cache'))
+    log_file = os.path.join(cache_dir, 'usb-creator.log')
     handler = None
     try:
         handler = logging.handlers.RotatingFileHandler(log_file,