Bug#687897: unblock: tortoisehg/2.4-2
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package tortoisehg
tortoisehg-nautilus has a serious bug [1] which prevents the nautilus
extension to start on new installation of tortoisehg.
Older version of toroisehg were using ~/.tortoisehg/ as settings
directory. Version 2.4, instead, uses the Qt settings directory, i.e.
{$XDG_CONFIG_HOME,~}/TortoiseHg/
However the nautilus extension still uses the old directory and crashes
with an excpetion when such directory does not exists.
The new upload of tortoisehg includes a patch from upstream that fixes
the location of the settings directory and creates if it does not
exists.
Thanks,
Ludovico
unblock tortoisehg/2.4-2
-- System Information:
Debian Release: wheezy/sid
APT prefers testing
APT policy: (500, 'testing')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.2.0-3-amd64 (SMP w/2 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru tortoisehg-2.4/debian/changelog tortoisehg-2.4/debian/changelog
--- tortoisehg-2.4/debian/changelog 2012-05-29 10:16:16.000000000 +0200
+++ tortoisehg-2.4/debian/changelog 2012-09-16 22:48:11.000000000 +0200
@@ -1,3 +1,10 @@
+tortoisehg (2.4-2) unstable; urgency=medium
+
+ * Add fix-config-path.patch to fix crash on new installations of
+ tortoisehg-nautilus (Closes: #678558).
+
+ -- Ludovico Cavedon <cavedon@debian.org> Sun, 16 Sep 2012 22:39:10 +0200
+
tortoisehg (2.4-1) unstable; urgency=low
* Imported Upstream version 2.4 (Closes: #671473).
diff -Nru tortoisehg-2.4/debian/patches/fix-config-path.patch tortoisehg-2.4/debian/patches/fix-config-path.patch
--- tortoisehg-2.4/debian/patches/fix-config-path.patch 1970-01-01 01:00:00.000000000 +0100
+++ tortoisehg-2.4/debian/patches/fix-config-path.patch 2012-09-16 22:38:53.000000000 +0200
@@ -0,0 +1,49 @@
+Description: fix configuration path (and crash on startup)
+Origin: https://bitbucket.org/tortoisehg/thg/changeset/9635693f3b973702fdee4e8fa487afb4d93959be
+Bug-Debian: http://bugs.debian.org/678558
+
+# HG changeset patch
+# User Jairo Llopis <yajo.sk8@gmail.com>
+# Date 1342020308 -7200
+# Node ID 9635693f3b973702fdee4e8fa487afb4d93959be
+# Parent b73053f7cacb5ca8679d09b81363cd62473f5496
+nautilus: Fix issue #869 [1]. Nautilus extension now works.
+
+The nautilus extension now uses $XDG_CONFIG_HOME like the rest of thg.
+
+Links:
+ [1] https://bitbucket.org/tortoisehg/thg/issue/869/tortoisehg-nautilus-doesnt-work-at-all
+
+Index: tortoisehg-2.4/contrib/nautilus-thg.py
+===================================================================
+--- tortoisehg-2.4.orig/contrib/nautilus-thg.py 2012-09-16 22:35:49.904065810 +0200
++++ tortoisehg-2.4/contrib/nautilus-thg.py 2012-09-16 22:36:23.272376213 +0200
+@@ -66,10 +66,25 @@
+ from tortoisehg.util import menuthg
+ self.hgtk = paths.find_in_path(thg_main)
+ self.menu = menuthg.menuThg()
+- self.notify = os.path.expanduser('~/.tortoisehg/notify')
+
+- f = open(self.notify, 'w')
+- f.close()
++ # Get the configuration directory path
++ try:
++ self.notify = os.environ['XDG_CONFIG_HOME']
++ except KeyError:
++ self.notify = os.path.join('$HOME', '.config')
++
++ self.notify = os.path.expandvars(os.path.join(
++ self.notify,
++ 'TortoiseHg'))
++
++ # Create folder if it does not exist
++ if not os.path.isdir(self.notify):
++ os.makedirs(self.notify)
++
++ # Create the notify file
++ self.notify = os.path.join(self.notify, 'notify')
++ open(self.notify, 'w').close()
++
+ self.gmon = Gio.file_new_for_path(self.notify).monitor(Gio.FileMonitorFlags.NONE, None)
+ self.gmon.connect('changed', self.notified)
+
diff -Nru tortoisehg-2.4/debian/patches/series tortoisehg-2.4/debian/patches/series
--- tortoisehg-2.4/debian/patches/series 2012-05-29 10:16:16.000000000 +0200
+++ tortoisehg-2.4/debian/patches/series 2012-09-16 22:36:02.000000000 +0200
@@ -1 +1,2 @@
add-config-file.patch
+fix-config-path.patch
Reply to: