[Checkins] SVN: GenericSetup/branches/1.3/components.py Merged r78277 from the trunk

[Hanno Schlichting]

Log message for revision 78278:
  Merged r78277 from the trunk
  

Changed:
  U   GenericSetup/branches/1.3/components.py

-=-
Modified: GenericSetup/branches/1.3/components.py
===================================================================
--- GenericSetup/branches/1.3/components.py	2007-07-21 21:32:08 UTC (rev 78277)
+++ GenericSetup/branches/1.3/components.py	2007-07-21 21:32:45 UTC (rev 78278)
@@ -129,7 +129,7 @@
             factory = factory and _resolveDottedName(factory) or None
 
             obj_path = child.getAttribute('object')
-            if obj_path:
+            if not component and not factory and obj_path is not None:
                 # Get the site by either __parent__ or Acquisition
                 site = getattr(self.context, '__parent__', None)
                 if site is None: