gnue/common/src GConfig.py

[Arturas Kriukovas]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     Arturas Kriukovas <address@hidden>      02/05/02 12:17:43

Modified files:
        common/src     : GConfig.py 

Log message:
        Added GImport.py import, i18n changes.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/GConfig.py.diff?tr1=1.16&tr2=1.17&r1=text&r2=text

Patches:
Index: gnue/common/src/GConfig.py
diff -c gnue/common/src/GConfig.py:1.16 gnue/common/src/GConfig.py:1.17
*** gnue/common/src/GConfig.py:1.16     Sat Apr 27 18:13:02 2002
--- gnue/common/src/GConfig.py  Thu May  2 12:17:43 2002
***************
*** 35,40 ****
--- 35,41 ----
  from gnue.common import openResource
  import GDebug
  import copy
+ import GImport
  
  TRUE = 1
  FALSE = 0
***************
*** 112,125 ****
          # TODO: If not, then at least
          # TODO: make this an exception
          #
!         print "The gnue.conf file appears to be missing\n\n" \
!               +"The file should be located in one of the following 
locations\n"
          if etc_dir:
            print etc_dir + '/gnue.conf'
            print etc_dir + '/gnue.conf.fixed'
          if os.environ.has_key('HOME'):
            print os.environ['HOME']+'/.gnue/gnue.conf'
!         sys.exit("Missing GNUe config file")
  
        else:
          raise Exception,_error_msg
--- 113,126 ----
          # TODO: If not, then at least
          # TODO: make this an exception
          #
!         print _("The gnue.conf file appears to be missing\n\n") \
!               +_("The file should be located in one of the following 
locations\n")
          if etc_dir:
            print etc_dir + '/gnue.conf'
            print etc_dir + '/gnue.conf.fixed'
          if os.environ.has_key('HOME'):
            print os.environ['HOME']+'/.gnue/gnue.conf'
!         sys.exit(_("Missing GNUe config file"))
  
        else:
          raise Exception,_error_msg
***************
*** 140,151 ****
        except AttributeError:
          pass
      except DuplicateSectionError:
!       raise InvalidFormatError, 'The file has duplicate source definitions.'
      except MissingSectionHeaderError:
!       raise InvalidFormatError, 'The file has no source definitions.'
      except:
!       print'The file cannot be parsed. %s :: %s' % (sys.exc_type, 
sys.exc_value)
!       raise InvalidFormatError, 'The file cannot be parsed.'
  
      for option in self._parser.options(self._application):
        _OPTION[option] =  self._parser.get(self._application,option)
--- 141,152 ----
        except AttributeError:
          pass
      except DuplicateSectionError:
!       raise InvalidFormatError, _('The file has duplicate source 
definitions.')
      except MissingSectionHeaderError:
!       raise InvalidFormatError, _('The file has no source definitions.')
      except:
!       print _('The file cannot be parsed. %s :: %s') % (sys.exc_type, 
sys.exc_value)
!       raise InvalidFormatError, _('The file cannot be parsed.')
  
      for option in self._parser.options(self._application):
        _OPTION[option] =  self._parser.get(self._application,option)
***************
*** 178,184 ****
      text = input.read()
      input.close()
    except IOError:
!     raise "Unable to read the GNUE_INSTALLED_SITE_CFG file... There is a 
problem with your installation"
  
    # This evaluates the text file as a python script (hope you secured it)
    # The resulting namespace is stored as a dict in _site_config.
--- 179,185 ----
      text = input.read()
      input.close()
    except IOError:
!     raise _("Unable to read the GNUE_INSTALLED_SITE_CFG file... There is a 
problem with your installation")
  
    # This evaluates the text file as a python script (hope you secured it)
    # The resulting namespace is stored as a dict in _site_config.