gnue-navigator/src GNClient.py GNObjects.py

[Reinhard Mueller]

CVSROOT:        /cvsroot/gnue
Module name:    gnue-navigator
Branch:         
Changes by:     Reinhard Mueller <address@hidden>       03/09/25 19:17:16

Modified files:
        src            : GNClient.py GNObjects.py 

Log message:
        Do not use depreciated environment variable INSTALL_PREFIX

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-navigator/src/GNClient.py.diff?tr1=1.22&tr2=1.23&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-navigator/src/GNObjects.py.diff?tr1=1.18&tr2=1.19&r1=text&r2=text

Patches:
Index: gnue-navigator/src/GNClient.py
diff -c gnue-navigator/src/GNClient.py:1.22 gnue-navigator/src/GNClient.py:1.23
*** gnue-navigator/src/GNClient.py:1.22 Sun Aug 10 19:28:29 2003
--- gnue-navigator/src/GNClient.py      Thu Sep 25 19:17:16 2003
***************
*** 40,45 ****
--- 40,46 ----
  from gnue.common.utils.FileUtils import openResource, dyn_import
  from gnue.common.datasources import GDataObjects, GConnections
  from gnue.common.apps.GClientApp import *
+ from gnue import paths
  from gnue.navigator import VERSION
  
  from GNConfig import ConfigOptions as NavigatorConfigOptions
***************
*** 141,147 ****
      except:
        try:
          if string.split(string.lower(os.path.basename(sys.argv[0])),'.')[0] 
not in ('gnue-navigator','gncvs'):
!           processFile = 
os.environ['INSTALL_PREFIX']+'/'+gConfigNav('ProcessDir')+"/"+os.path.basename(sys.argv[0])+".gpd"
          else:
            raise IndexError
        except IndexError:
--- 142,148 ----
      except:
        try:
          if string.split(string.lower(os.path.basename(sys.argv[0])),'.')[0] 
not in ('gnue-navigator','gncvs'):
!           processFile = 
paths.data+'/'+gConfigNav('ProcessDir')+"/"+os.path.basename(sys.argv[0])+".gpd"
          else:
            raise IndexError
        except IndexError:
Index: gnue-navigator/src/GNObjects.py
diff -c gnue-navigator/src/GNObjects.py:1.18 
gnue-navigator/src/GNObjects.py:1.19
*** gnue-navigator/src/GNObjects.py:1.18        Mon Jun 16 08:39:27 2003
--- gnue-navigator/src/GNObjects.py     Thu Sep 25 19:17:16 2003
***************
*** 30,35 ****
--- 30,36 ----
  import sys, string, os, os.path
  from gnue.common.definitions import GObjects, GRootObj
  from gnue.common.apps import GDebug, GConfig
+ from gnue import paths
  import GNParser
  try: 
    from gnue.reports.base import GREngine,GRExceptions
***************
*** 64,70 ****
          formdir = gConfigNav('FormDir')
        except KeyError:
          formdir = ""
!       formfile = os.environ['INSTALL_PREFIX']+'/'+formdir+"/"+step.location
      else:
        formfile = step.location
  
--- 65,71 ----
          formdir = gConfigNav('FormDir')
        except KeyError:
          formdir = ""
!       formfile = os.path.join (paths.data, formdir, step.location)
      else:
        formfile = step.location
  
***************
*** 104,111 ****
          reportdir = gConfigNav('ReportDir')
        except KeyError:
          reportdir = ""
!       reportfile = os.environ['INSTALL_PREFIX']+'/'+reportdir+"/"+ \
!                    step.location
      else:
        reportfile = step.location
        
--- 105,111 ----
          reportdir = gConfigNav('ReportDir')
        except KeyError:
          reportdir = ""
!       reportfile = os.path.join (paths.data, reportdir, step.location)
      else:
        reportfile = step.location