[Zope-Checkins] CVS: Packages/OFS - Application.py:1.158

[Evan Simpson]

Update of /cvs-repository/Packages/OFS
In directory cvs.zope.org:/tmp/cvs-serv24201

Modified Files:
	Application.py 
Log Message:
Merge fix from branch


=== Packages/OFS/Application.py 1.157 => 1.158 ===
 
     for priority, product_name, index, product_dir in products:
-        if done.has_key(product_name): continue
-        done[product_name]=1
+        if done.has_key(product_name):
+            LOG('OFS.Application', WARNING, 'Duplicate Product name',
+                'After loading Product %s from %s,\n'
+                'I skipped the one in %s.\n' % (
+                `product_name`, `done[product_name]`, `product_dir`) )
+            continue
+        done[product_name]=product_dir
         import_product(product_dir, product_name)
 
 def import_product(product_dir, product_name, raise_exc=0, log_exc=1):