30 lines
1.3 KiB
Diff
30 lines
1.3 KiB
Diff
diff --exclude-from=exclude -N -u -r nsasepolgen/src/sepolgen/Makefile policycoreutils-2.0.1/sepolgen-1.0.0/src/sepolgen/Makefile
|
|
--- nsasepolgen/src/sepolgen/Makefile 2007-02-07 12:12:15.000000000 -0500
|
|
+++ policycoreutils-2.0.1/sepolgen-1.0.0/src/sepolgen/Makefile 2007-02-15 15:56:05.000000000 -0500
|
|
@@ -1,4 +1,4 @@
|
|
-PYTHONLIBDIR ?= `python -c "from distutils.sysconfig import *; print get_python_lib()"`
|
|
+PYTHONLIBDIR ?= $(shell python -c "from distutils.sysconfig import *; print get_python_lib(1)")
|
|
PACKAGEDIR ?= $(DESTDIR)/$(PYTHONLIBDIR)/sepolgen
|
|
|
|
install:
|
|
diff --exclude-from=exclude -N -u -r nsasepolgen/src/sepolgen/refparser.py policycoreutils-2.0.1/sepolgen-1.0.0/src/sepolgen/refparser.py
|
|
--- nsasepolgen/src/sepolgen/refparser.py 2007-02-07 12:12:15.000000000 -0500
|
|
+++ policycoreutils-2.0.1/sepolgen-1.0.0/src/sepolgen/refparser.py 2007-02-15 15:16:09.000000000 -0500
|
|
@@ -691,11 +691,13 @@
|
|
output.write(msg)
|
|
|
|
def parse_file(f, module, spt=None):
|
|
- fd = open(f)
|
|
- txt = fd.read()
|
|
- fd.close()
|
|
try:
|
|
+ fd = open(f)
|
|
+ txt = fd.read()
|
|
+ fd.close()
|
|
parse(txt, module, spt)
|
|
+ except IOError, e:
|
|
+ return
|
|
except ValueError, e:
|
|
raise ValueError("error parsing file %s: %s" % (f, str(e)))
|
|
|