Commit e5ad49cb authored by Andreas Jung's avatar Andreas Jung

- further fixes for """AttributeError: Buildout instance has no

  attribute '_logger'""" by providing reasonable defaults 
  within the Buildout constructor (related to the new 'allow-hosts' option)
  (patch by Gottfried Ganssauge) (ajung)

parent 15ad6ced
...@@ -7,6 +7,11 @@ Change History ...@@ -7,6 +7,11 @@ Change History
1.0.6 (unreleased) 1.0.6 (unreleased)
================== ==================
- further fixes for """AttributeError: Buildout instance has no
attribute '_logger'""" by providing reasonable defaults
within the Buildout constructor (related to the new 'allow-hosts' option)
(patch by Gottfried Ganssauge) (ajung)
1.0.5 (2008-06-10) 1.0.5 (2008-06-10)
================== ==================
......
...@@ -124,16 +124,30 @@ class Buildout(UserDict.DictMixin): ...@@ -124,16 +124,30 @@ class Buildout(UserDict.DictMixin):
self._parts = [] self._parts = []
# provide some defaults before options are parsed # provide some defaults before options are parsed
# because while parsing options those attributes might be # because while parsing options those attributes might be
# used already (Gottfried Ganssauage) # used already (Gottfried Ganssauge)
self._links = () buildout_section = data.get ('buildout')
links = buildout_section and buildout_section.get('find-links', '')
self._links = links and links.split() or ()
allow_hosts = buildout_section and buildout_section.get(
'allow-hosts', '*').split('\n')
self._allow_hosts = tuple([host.strip() for host in allow_hosts
if host.strip() != ''])
self._buildout_dir = os.getcwd() self._buildout_dir = os.getcwd()
self._logger = logging.getLogger('zc.buildout') self._logger = logging.getLogger('zc.buildout')
self.offline = False self.offline = False
self.newest = True self.newest = True
##################################################################
## WARNING!!!
## ALL ATTRIBUTES MUST HAVE REASONABLE DEFAULTS AT THIS POINT
## OTHERWISE ATTRIBUTEERRORS MIGHT HAPPEN ANY TIME
##################################################################
# initialize some attrs and buildout directories. # initialize some attrs and buildout directories.
options = self['buildout'] options = self['buildout']
# now reinitialize
links = options.get('find-links', '') links = options.get('find-links', '')
self._links = links and links.split() or () self._links = links and links.split() or ()
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment