[Selinux-commits] SF.net SVN: selinux: [2247] trunk/sepolgen/src/sepolgen

[<ssm...@us...>]

Revision: 2247
          http://svn.sourceforge.net/selinux/?rev=2247&view=rev
Author:   ssmalley
Date:     2007-02-21 09:11:26 -0800 (Wed, 21 Feb 2007)

Log Message:
-----------
Author: Daniel J Walsh
Email: dw...@re...
Subject: sepolgen fixes.
Date: Tue, 20 Feb 2007 09:55:41 -0500

    Change to Makefile to get proper python library path even on 64 bit 
platforms.
    Empty or poorly formated interface files cause sepol-ifgen to crash. 

Modified Paths:
--------------
    trunk/sepolgen/src/sepolgen/Makefile
    trunk/sepolgen/src/sepolgen/refparser.py

Modified: trunk/sepolgen/src/sepolgen/Makefile
===================================================================
--- trunk/sepolgen/src/sepolgen/Makefile	2007-02-21 17:09:32 UTC (rev 2246)
+++ trunk/sepolgen/src/sepolgen/Makefile	2007-02-21 17:11:26 UTC (rev 2247)
@@ -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:

Modified: trunk/sepolgen/src/sepolgen/refparser.py
===================================================================
--- trunk/sepolgen/src/sepolgen/refparser.py	2007-02-21 17:09:32 UTC (rev 2246)
+++ trunk/sepolgen/src/sepolgen/refparser.py	2007-02-21 17:11:26 UTC (rev 2247)
@@ -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)))
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.