gnue-appserver/src/classrep __init__.py

[Reinhard Mueller]

CVSROOT:        /cvsroot/gnue
Module name:    gnue-appserver
Branch:         
Changes by:     Reinhard Mueller <address@hidden>       03/09/19 13:58:08

Modified files:
        src/classrep   : __init__.py 

Log message:
        Use os.path.join to build path.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-appserver/src/classrep/__init__.py.diff?tr1=1.10&tr2=1.11&r1=text&r2=text

Patches:
Index: gnue-appserver/src/classrep/__init__.py
diff -c gnue-appserver/src/classrep/__init__.py:1.10 
gnue-appserver/src/classrep/__init__.py:1.11
*** gnue-appserver/src/classrep/__init__.py:1.10        Fri Sep 19 12:58:43 2003
--- gnue-appserver/src/classrep/__init__.py     Fri Sep 19 13:58:08 2003
***************
*** 19,25 ****
  # write to the Free Software Foundation, Inc., 59 Temple Place 
  # - Suite 330, Boston, MA 02111-1307, USA.
  #
! # $Id: __init__.py,v 1.10 2003/09/19 16:58:43 reinhard Exp $
  
  import os, sys
  
--- 19,25 ----
  # write to the Free Software Foundation, Inc., 59 Temple Place 
  # - Suite 330, Boston, MA 02111-1307, USA.
  #
! # $Id: __init__.py,v 1.11 2003/09/19 17:58:08 reinhard Exp $
  
  import os, sys
  
***************
*** 44,52 ****
      basedir  = 
os.path.dirname(sys.modules["gnue.appserver.classrep"].__file__)
    except:
      basedir  = os.path.dirname(__file__)    
!   if not os.path.isfile (basedir + "/repository.ini"):
!     basedir = os.environ ["INSTALL_PREFIX"] + "/share/gnue-appserver"
!   modules = ModuleDict (None, RepositoryDefinition 
(basedir+"/repository.ini"))
    classes = ClassDict (None, modules)
    # Now, we can access the database to load the real repository
    session = Session.InternalSession (server)
--- 44,54 ----
      basedir  = 
os.path.dirname(sys.modules["gnue.appserver.classrep"].__file__)
    except:
      basedir  = os.path.dirname(__file__)    
!   if not os.path.isfile (os.path.join (basedir, "repository.ini")):
!     basedir = os.path.join (os.environ ["INSTALL_PREFIX"], "share",
!                             "gnue-appserver")
!   modules = ModuleDict (None, RepositoryDefinition (os.path.join (basedir,
!                                                             
"repository.ini")))
    classes = ClassDict (None, modules)
    # Now, we can access the database to load the real repository
    session = Session.InternalSession (server)