Return-Path: Delivered-To: apmail-gump-general-archive@www.apache.org Received: (qmail 15730 invoked from network); 2 Jul 2004 14:55:54 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 2 Jul 2004 14:55:54 -0000 Received: (qmail 96762 invoked by uid 500); 2 Jul 2004 14:54:24 -0000 Delivered-To: apmail-gump-general-archive@gump.apache.org Received: (qmail 96667 invoked by uid 500); 2 Jul 2004 14:54:23 -0000 Mailing-List: contact general-help@gump.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Gump code and data" Reply-To: "Gump code and data" Delivered-To: mailing list general@gump.apache.org Received: (qmail 96450 invoked by uid 500); 2 Jul 2004 14:54:20 -0000 Received: (qmail 96397 invoked by uid 99); 2 Jul 2004 14:54:20 -0000 X-ASF-Spam-Status: No, hits=0.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.27.1) with SMTP; Fri, 02 Jul 2004 07:54:20 -0700 Received: (qmail 14816 invoked by uid 1728); 2 Jul 2004 14:54:12 -0000 Date: 2 Jul 2004 14:54:12 -0000 Message-ID: <20040702145412.14815.qmail@minotaur.apache.org> From: ajack@apache.org To: gump-cvs@apache.org Subject: cvs commit: gump/python/gump/document/xdocs documenter.py X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N ajack 2004/07/02 07:54:12 Modified: python/gump/document/xdocs Tag: CleanUp documenter.py Log: Try to cope w/ contents/X and contents/xdocs/X. Revision Changes Path No revision No revision 1.9.2.31 +24 -9 gump/python/gump/document/xdocs/documenter.py Index: documenter.py =================================================================== RCS file: /home/cvs/gump/python/gump/document/xdocs/documenter.py,v retrieving revision 1.9.2.30 retrieving revision 1.9.2.31 diff -u -r1.9.2.30 -r1.9.2.31 --- documenter.py 2 Jul 2004 14:25:31 -0000 1.9.2.30 +++ documenter.py 2 Jul 2004 14:54:12 -0000 1.9.2.31 @@ -199,23 +199,38 @@ # Get relative to (1) work [source] (2) log [target] & sync - # The move contents/xdocs from work directory to log + # Move xdocs from work directory to log xdocWorkDir=self.getXDocWorkDirectory() logDirectory=self.getXDocLogDirectory() - workContents=os.path.abspath( - os.path.join(xdocWorkDir,objDir)) - - logContents=os.path.abspath( - os.path.join(logDirectory,objDir)) + workContents=os.path.abspath(os.path.join(xdocWorkDir,objDir)) + logContents=os.path.abspath(os.path.join(logDirectory,objDir)) success=True try: - # Sync over public pages... - syncDirectories(workContents,logContents) + if os.path.exists(workContents): + # Sync over public pages... + syncDirectories(workContents,logContents) except: - log.error('--- Failed to sync work->log ', exc_info=1) + log.error('--- Failed to sync ['+`objDir`+'] (work->log)', exc_info=1) success=False + + if self.config.isXdocs(): + # Move contents/xdocs from work directory to log + # (Note: Forrest has contents/X and contents/xdocs/X) + xdocWorkDir=os.path.abspath(os.path.join(xdocWorkDir,'xdocs')) + logDirectory=os.path.abspath(os.path.join(logDirectory,'xdocs')) + + workContents=os.path.abspath(os.path.join(xdocWorkDir,objDir)) + logContents=os.path.abspath(os.path.join(logDirectory,objDir)) + + try: + if os.path.exists(workContents): + # Sync over public pages... + syncDirectories(workContents,logContents) + except: + log.error('--- Failed to sync xdocs ['+`objDir`+'] (work->log)', exc_info=1) + success=False return success --------------------------------------------------------------------- To unsubscribe, e-mail: general-unsubscribe@gump.apache.org For additional commands, e-mail: general-help@gump.apache.org