[Pkg-sugar-commit] [sugar-toolkit-gtk3] 01/02: Add patch cherry-picked upstream to fix depend instead of append to path. Closes: Bug#860943. Thanks to James Cameron.

[Jonas Smedegaard]

This is an automated email from the git hooks/post-receive script.

js pushed a commit to branch master-0.110
in repository sugar-toolkit-gtk3.

commit 5fcc9c9a46f271b53bde951bc19ca6fdb5875d1a
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sat Apr 22 14:18:25 2017 +0200

    Add patch cherry-picked upstream to fix depend instead of append to path. Closes: Bug#860943. Thanks to James Cameron.
---
 debian/patches/020170327~495eed8.patch | 26 ++++++++++++++++++++++++++
 debian/patches/series                  |  1 +
 2 files changed, 27 insertions(+)

diff --git a/debian/patches/020170327~495eed8.patch b/debian/patches/020170327~495eed8.patch
new file mode 100644
index 0000000..3062e73
--- /dev/null
+++ b/debian/patches/020170327~495eed8.patch
@@ -0,0 +1,26 @@
+Description: Prepend instead of append to path
+ When an activity is launched, an import should first search the
+ activity bundle source rather than /usr/bin
+ .
+ Fixes the need to change activity sources every time a system package
+ conflicts with an import.
+ .
+ May impact any activity that relies on a system package being in search
+ path before the bundle source.  Forty activities were tested, and none
+ relied on this.
+Author: James Cameron <quozl at laptop.org>
+Origin: Upstream, https://github.com/sugarlabs/sugar-toolkit-gtk3/commit/495eed8
+Bug-Debian: https://bugs.debian.org/860943
+Last-Update: 2017-04-22
+
+--- a/bin/sugar-activity
++++ b/bin/sugar-activity
+@@ -114,7 +114,7 @@
+     os.environ['SUGAR_BUNDLE_PATH'] = os.path.abspath(os.curdir)
+ 
+     bundle_path = os.environ['SUGAR_BUNDLE_PATH']
+-    sys.path.append(bundle_path)
++    sys.path.insert(0, bundle_path)
+ 
+     try:
+         bundle = ActivityBundle(bundle_path)
diff --git a/debian/patches/series b/debian/patches/series
index 03af722..c3cf2e0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,6 @@
 020161109~a6e62a5.patch
 020161109~ee93ad3.patch
 020170102~05a18a2.patch
+020170327~495eed8.patch
 2002_ignore_debian_and_quilt-patches.patch
 #2003_bundlebuilder_exit_nonzero_on_error.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-sugar/sugar-toolkit-gtk3.git