From: Uwe Hermann <redacted>
Date: Mon, 23 Jan 2012 18:58:06 +0000 (+0100)
Subject: srd: Prepend (not append) PD dirs to sys.path.
X-Git-Tag: libsigrokdecode-0.1.0~104
X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=commitdiff_plain;h=9d9fcb375d7702082146bf917a5d19cc83480eae

srd: Prepend (not append) PD dirs to sys.path.
---

diff --git a/controller.c b/controller.c
index 845208a..f3c1446 100644
--- a/controller.c
+++ b/controller.c
@@ -118,10 +118,19 @@ int srd_exit(void)
 
 
 /**
- * Add search directories for the protocol decoders.
+ * Add an additional search directory for the protocol decoders.
+ *
+ * The specified directory is prepended (not appended!) to Python's sys.path,
+ * in order to search for sigrok protocol decoders in the specified
+ * directories first, and in the generic Python module directories (and in
+ * the current working directory) last. This avoids conflicts if there are
+ * Python modules which have the same name as a sigrok protocol decoder in
+ * sys.path or in the current working directory.
  *
  * TODO: add path from env var SIGROKDECODE_PATH, config etc
  * TODO: Should take directoryname/path as input.
+ *
+ * @return TODO.
  */
 int set_modulepath(void)
 {
@@ -143,9 +152,8 @@ int set_modulepath(void)
 	path = g_strdup(DECODERS_DIR);
 #endif
 
-	/* TODO: Prepend instead of appending. */
 	/* TODO: Sanity check on 'path' (length, escape special chars, ...). */
-	s = g_strdup_printf("import sys; sys.path.append(r'%s')", path);
+	s = g_strdup_printf("import sys; sys.path.insert(0, r'%s')", path);
 
 	ret = PyRun_SimpleString(s);