cvs commit: jakarta-gump/python/gump model.py launcher.py conf.py

[aj...@apache.org]

ajack       2003/10/20 07:07:53

  Modified:    python/gump model.py launcher.py conf.py
  Log:
  If property not named, go w/ project name as property.
  
  Revision  Changes    Path
  1.34      +12 -9     jakarta-gump/python/gump/model.py
  
  Index: model.py
  ===================================================================
  RCS file: /home/cvs/jakarta-gump/python/gump/model.py,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- model.py	20 Oct 2003 04:34:29 -0000	1.33
  +++ model.py	20 Oct 2003 14:07:53 -0000	1.34
  @@ -402,12 +402,15 @@
         # Generate the property
         property=Property(depend.__dict__)
         property['reference']='jarpath'
  -      # :TODO: AJ added this, and the 'elif' -- which seems wrong
  -      # but 
  -      if depend.property:
  -          property['name']=depend.property
  -      elif not hasattr(property,'name') or not property['name']:          
  -          property['name']=depend.project
  +      
  +      # Name the property...
  +      name=depend.property
  +      if name:
  +        property['name']=depend.property
  +      else:
  +        property['name']=depend.project
  +        log.warning('Unnamed property in depend for: ' + depend.project + ' on ' + project.name)
  +        
         # :TODO: AJ added this, no idea if it is right/needed.
         if depend.id: property['ids']= depend.id
         # Store it
  
  
  
  1.22      +6 -2      jakarta-gump/python/gump/launcher.py
  
  Index: launcher.py
  ===================================================================
  RCS file: /home/cvs/jakarta-gump/python/gump/launcher.py,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- launcher.py	20 Oct 2003 13:51:41 -0000	1.21
  +++ launcher.py	20 Oct 2003 14:07:53 -0000	1.22
  @@ -96,14 +96,18 @@
   def getParameterFromString(strp):
       """Extract a Parameter Object from a String"""
       parts=split(strp,'=')
  -    if len(parts)==1:
  +    partCount=len(parts)
  +    if partCount==1:
           pname=parts[0]
           pvalue=None
           psep=''
  -    else:
  +    elif partCount > 1:
           pname=parts[0]
           pvalue=parts[1]
           psep='='
  +    else:
  +        return None
  +        
       return Parameter(pname,pvalue,psep)
       
   class Parameters:
  
  
  
  1.27      +4 -4      jakarta-gump/python/gump/conf.py
  
  Index: conf.py
  ===================================================================
  RCS file: /home/cvs/jakarta-gump/python/gump/conf.py,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- conf.py	19 Oct 2003 22:00:38 -0000	1.26
  +++ conf.py	20 Oct 2003 14:07:53 -0000	1.27
  @@ -120,7 +120,7 @@
       
   class switch:
       """Configuration of switches """   
  -    optimize=0 # Optimize (at risk to exact correctness) anywhere one can
  +    optimize=1 # Optimize (at risk to exact correctness) anywhere one can
       optimizenetwork=1 # Do least network traffic 
       failtesting=0 # Not testing.. 
       debugging=0 # Not debugging..