chiark / gitweb /
make-secnet-sites: Fix python path manipulation
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Fri, 18 Oct 2019 20:29:18 +0000 (21:29 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Thu, 24 Oct 2019 18:16:16 +0000 (19:16 +0100)
This makes it possible to set PYTHONPATH to prefer the in-tree
modules.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
make-secnet-sites

index d6f9ee0aa621f359614b04b12ef376ed6fb9765c..ea2dbc3a9bc87f83415e5ffa285f80ac58c62b4b 100755 (executable)
@@ -62,8 +62,10 @@ import re
 
 import ipaddr
 
-sys.path.insert(0,"/usr/local/share/secnet")
-sys.path.insert(0,"/usr/share/secnet")
+# entry 0 is "near the executable", or maybe from PYTHONPATH=.,
+# which we don't want to preempt
+sys.path.insert(1,"/usr/local/share/secnet")
+sys.path.insert(1,"/usr/share/secnet")
 import ipaddrset
 
 VERSION="0.1.18"