Merge branch 'customtopos' into bl-dev

2010-03-01 15:34:40 -08:00
parent e0cfcdd505 28ab4a33d6
commit 63214ea2af
12 changed files with 159 additions and 32 deletions
@@ -462,9 +462,11 @@ class NOX( Controller ):
            noxArgs = [ noxArgs ]
        if not noxArgs:
            noxArgs = [ 'packetdump' ]
+ 
+        if 'NOX_CORE_DIR' not in os.environ:
+            exit( 'exiting; please set missing NOX_CORE_DIR env var' )       
        noxCoreDir = os.environ[ 'NOX_CORE_DIR' ]
-        if not noxCoreDir:
-            raise Exception( 'please set NOX_CORE_DIR env var\n' )
+
        Controller.__init__( self, name,
            controller=noxCoreDir + '/nox_core',
            cargs='--libdir=/usr/local/lib -v -i ptcp: ' +