ajack       2003/09/25 14:59:55

  Modified:    python/gump document.py
  Log:
  Copy cp -Rufv to try to see why cp -Rf isn't copying new sub-dirs
  Can't really use rsynch, sadly.
  
  Revision  Changes    Path
  1.41      +8 -4      jakarta-gump/python/gump/document.py
  
  Index: document.py
  ===================================================================
  RCS file: /home/cvs/jakarta-gump/python/gump/document.py,v
  retrieving revision 1.40
  retrieving revision 1.41
  diff -u -r1.40 -r1.41
  --- document.py       25 Sep 2003 19:33:49 -0000      1.40
  +++ document.py       25 Sep 2003 21:59:55 -0000      1.41
  @@ -152,9 +152,9 @@
       forrestSiteTemplate=getForrestSiteTemplateDir()    
       forrest=getForrestDir(workspace)    
       
  -    # This gave an ugly tree (src/doc/cont../xdocs..)
  +    # :TODO: This gave an ugly tree (src/doc/cont../xdocs..)
       # with sub-directories. It is a nice idea, but not
  -    # quite there for us now, do a plain old tempalte
  +    # quite there for us now, do a plain old template
       # copy instead.
       
       # First .. seed the project    
  @@ -166,9 +166,13 @@
       #work=CommandWorkItem(WORK_TYPE_DOCUMENT,forrest,forrestSeedResult)
       #context.performedWork(work)
       
  +    # Consider syncDirectories (to start with)
  +    # cp -Rf doesn't seem to be doing a nice job of overwritting :(
  +    # rsynch would disallow default/site though :(
  +    
       # Copy in the defaults
       forrestSeed=Cmd('cp','forrest_seed',forrest)
  -    forrestSeed.addParameter('-Rf')
  +    forrestSeed.addParameter('-Rufv')
       forrestSeed.addParameter(forrestTemplate)    
       forrestSeed.addParameter(os.path.abspath(workspace.basedir))    
       forrestSeedResult=execute(forrestSeed)
  @@ -178,7 +182,7 @@
       # Copy over the local site defaults (if any)
       if os.path.exists(forrestSiteTemplate):
           forrestSiteSeed=Cmd('cp','forrest_site_seed',forrest)
  -        forrestSiteSeed.addParameter('-Rf')
  +        forrestSiteSeed.addParameter('-Rufv')
           forrestSiteSeed.addParameter(forrestSiteTemplate)    
           forrestSiteSeed.addParameter(workspace.basedir)  
           forrestSiteSeedResult=execute(forrestSiteSeed)
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to