[Zope-Checkins] CVS: Zope/lib/python/Products/SiteAccess - VirtualHostMonster.py:1.9.4.1

[Chris McDonough]

Update of /cvs-repository/Zope/lib/python/Products/SiteAccess
In directory cvs.zope.org:/tmp/cvs-serv27194/SiteAccess

Modified Files:
      Tag: chrism-install-branch
	VirtualHostMonster.py 
Log Message:
Merging chrism-install-branch with HEAD (hopefully for one of the last
times).



=== Zope/lib/python/Products/SiteAccess/VirtualHostMonster.py 1.9 => 1.9.4.1 ===
--- Zope/lib/python/Products/SiteAccess/VirtualHostMonster.py:1.9	Wed Aug 14 18:25:10 2002
+++ Zope/lib/python/Products/SiteAccess/VirtualHostMonster.py	Fri Jan  3 01:33:15 2003
@@ -59,13 +59,14 @@
                         while i2 < len(obpath) and obpath[i2][:4] == '_vh_':
                             i2 = i2 + 1
                         del obpath[i1:i2]
-                    try:
-                        ob = self.unrestrictedTraverse(obpath)
-                    except:
-                        raise 'LineError', 'Path not found'
-                    if not getattr(ob.aq_base, 'isAnObjectManager', 0):
-                        raise 'LineError', ('Path must lead to '
-                                            'an Object Manager')
+                    if obpath:
+                        try:
+                            ob = self.unrestrictedTraverse(obpath)
+                        except:
+                            raise 'LineError', 'Path not found'
+                        if not getattr(ob.aq_base, 'isAnObjectManager', 0):
+                            raise 'LineError', ('Path must lead to '
+                                                'an Object Manager')
                     if 'VirtualHostRoot' not in pp:
                         pp.append('/')
                     pp.reverse()