Commit b163021f authored by Evan Simpson's avatar Evan Simpson

Merge fix from branch

parent 42fe5621
...@@ -84,8 +84,8 @@ ...@@ -84,8 +84,8 @@
############################################################################## ##############################################################################
__doc__='''Application support __doc__='''Application support
$Id: Application.py,v 1.157 2001/08/09 20:41:00 chrism Exp $''' $Id: Application.py,v 1.158 2001/10/12 13:39:11 evan Exp $'''
__version__='$Revision: 1.157 $'[11:-2] __version__='$Revision: 1.158 $'[11:-2]
import Globals,Folder,os,sys,App.Product, App.ProductRegistry, misc_ import Globals,Folder,os,sys,App.Product, App.ProductRegistry, misc_
import time, traceback, os, string, Products import time, traceback, os, string, Products
...@@ -531,8 +531,13 @@ def import_products(): ...@@ -531,8 +531,13 @@ def import_products():
products = get_products() products = get_products()
for priority, product_name, index, product_dir in products: for priority, product_name, index, product_dir in products:
if done.has_key(product_name): continue if done.has_key(product_name):
done[product_name]=1 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) import_product(product_dir, product_name)
def import_product(product_dir, product_name, raise_exc=0, log_exc=1): def import_product(product_dir, product_name, raise_exc=0, log_exc=1):
......
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