chiark
/
gitweb
/
~ian
/
secnet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
resolver: Support IPv6 literals
[secnet.git]
/
make-secnet-sites
diff --git
a/make-secnet-sites
b/make-secnet-sites
index aa503440d6b3555a60df0591aafe19ae4e958a15..b8a2077d8e76274b326817b65dfc523e0f20ec62 100755
(executable)
--- a/
make-secnet-sites
+++ b/
make-secnet-sites
@@
-57,8
+57,8
@@
import getopt
import re
# The ipaddr library is installed as part of secnet
import re
# The ipaddr library is installed as part of secnet
-sys.path.
append(
"/usr/local/share/secnet")
-sys.path.
append(
"/usr/share/secnet")
+sys.path.
insert(0,
"/usr/local/share/secnet")
+sys.path.
insert(0,
"/usr/share/secnet")
import ipaddr
VERSION="0.1.18"
import ipaddr
VERSION="0.1.18"
@@
-480,7
+480,7
@@
else:
if len(sys.argv)>3:
print "Too many arguments"
sys.exit(1)
if len(sys.argv)>3:
print "Too many arguments"
sys.exit(1)
- pfilepath(sys.argv[1]
,allow_include=True
)
+ pfilepath(sys.argv[1])
of=sys.stdout
if len(sys.argv)>2:
of=open(sys.argv[2],'w')
of=sys.stdout
if len(sys.argv)>2:
of=open(sys.argv[2],'w')