r45818 - in /desktop/unstable/libpeas/debian: changelog patches/ patches/0001-Fix-Python-plugin-loader-module-paths.patch patches/series

[biebl at users.alioth.debian.org]

Author: biebl
Date: Thu Sep  3 22:31:50 2015
New Revision: 45818

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=45818
Log:
Fix Python plugin loader module paths. Patch taken from bgo#753401.

Added:
    desktop/unstable/libpeas/debian/patches/
    desktop/unstable/libpeas/debian/patches/0001-Fix-Python-plugin-loader-module-paths.patch
    desktop/unstable/libpeas/debian/patches/series
Modified:
    desktop/unstable/libpeas/debian/changelog

Modified: desktop/unstable/libpeas/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libpeas/debian/changelog?rev=45818&op=diff
==============================================================================
--- desktop/unstable/libpeas/debian/changelog	[utf-8] (original)
+++ desktop/unstable/libpeas/debian/changelog	[utf-8] Thu Sep  3 22:31:50 2015
@@ -16,6 +16,7 @@
   * Update symbols file. Mark private symbols as optional.
   * Bump debhelper compatibility level to 9.
   * Drop obsolete Conflicts and Replaces from pre-wheezy.
+  * Fix Python plugin loader module paths. Patch taken from bgo#753401.
 
  -- Andreas Henriksson <andreas at fatal.se>  Tue, 18 Aug 2015 14:08:11 +0200
 

Added: desktop/unstable/libpeas/debian/patches/0001-Fix-Python-plugin-loader-module-paths.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libpeas/debian/patches/0001-Fix-Python-plugin-loader-module-paths.patch?rev=45818&op=file
==============================================================================
--- desktop/unstable/libpeas/debian/patches/0001-Fix-Python-plugin-loader-module-paths.patch	(added)
+++ desktop/unstable/libpeas/debian/patches/0001-Fix-Python-plugin-loader-module-paths.patch	[utf-8] Thu Sep  3 22:31:50 2015
@@ -0,0 +1,34 @@
+From d2481760d8b441c92531b8d3b167a7b072166485 Mon Sep 17 00:00:00 2001
+From: Garrett Regier <garrettregier at gmail.com>
+Date: Tue, 1 Sep 2015 14:10:11 -0700
+Subject: [PATCH] Fix Python plugin loader module paths
+
+Popping the first item from the module paths
+was only required when PySys_SetArgv() was used.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=753401
+Signed-off-by: Garrett Regier <garrettregier at gmail.com>
+---
+ loaders/python/peas-python-internal.py | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/loaders/python/peas-python-internal.py b/loaders/python/peas-python-internal.py
+index 1f96ee1..00bc72c 100644
+--- a/loaders/python/peas-python-internal.py
++++ b/loaders/python/peas-python-internal.py
+@@ -41,11 +41,9 @@ class Hooks(object):
+             if int_handler == signal.default_int_handler:
+                 signal.signal(signal.SIGINT, signal.SIG_DFL)
+ 
+-        # See PySys_SetArgvEx()
+         sys.argv = [PRGNAME]
+-        sys.path.pop(0)
+-
+         sys.path.insert(0, PEAS_PYEXECDIR)
++
+         gettext.install(GETTEXT_PACKAGE, PEAS_LOCALEDIR)
+ 
+         self.__idle_gc = 0
+-- 
+2.5.1
+

Added: desktop/unstable/libpeas/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libpeas/debian/patches/series?rev=45818&op=file
==============================================================================
--- desktop/unstable/libpeas/debian/patches/series	(added)
+++ desktop/unstable/libpeas/debian/patches/series	[utf-8] Thu Sep  3 22:31:50 2015
@@ -0,0 +1 @@
+0001-Fix-Python-plugin-loader-module-paths.patch