[Openfirst-cvscommit] www/htdocs/nightly package.py,1.3,1.4

[Jamie <ast...@us...>]

Update of /cvsroot/openfirst/www/htdocs/nightly
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20909/www/htdocs/nightly

Modified Files:
	package.py 
Log Message:
Added some enhancements.

Index: package.py
===================================================================
RCS file: /cvsroot/openfirst/www/htdocs/nightly/package.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** package.py	21 Nov 2005 19:51:17 -0000	1.3
--- package.py	23 Feb 2006 18:11:23 -0000	1.4
***************
*** 15,19 ****
  from subprocess import *
  import warnings
! warnings.filterwarnings(action='ignore', message='.*tempnam.*')
  
  ## Declare CLI options
--- 15,19 ----
  from subprocess import *
  import warnings
! warnings.filterwarnings(action='ignore', message='.*tmpnam.*')
  
  ## Declare CLI options
***************
*** 54,59 ****
          return False
  
  def checkOutCVS(module, target=None):
!     command = "cvs -d%s export -r%s -R " % (CVSROOT, CVSTag)
      if target is not None:
          command += "-d %s " % (target)
--- 54,73 ----
          return False
  
+ def makeNiceList(list):
+ 	ret = ''
+ 	if len(list) == 0:
+ 		return ''
+ 	elif len(list) == 1:
+ 		return list[0]
+ 	else:
+ 		for i in list[:-1]:
+ 			ret += i
+ 			ret += ', '
+ 		ret += 'and '
+ 		ret += list[-1]
+ 		return ret
+ 
  def checkOutCVS(module, target=None):
!     command = "cvs -d%s export -kb -r%s -R " % (CVSROOT, CVSTag)
      if target is not None:
          command += "-d %s " % (target)
***************
*** 149,153 ****
  failed = []
  
! print "Generating package %s using modules %s." % (package, modules)
  
  ## Checkout CVS first
--- 163,167 ----
  failed = []
  
! print "Generating package %s using modules %s." % (package, makeNiceList(modules))
  
  ## Checkout CVS first
***************
*** 176,179 ****
      for m in failed: mods += m+", "
      print """%u module(s) failed to be exported, and were not included in
! the package. They are:
! %s""" % (len(failed), failed)
--- 190,193 ----
      for m in failed: mods += m+", "
      print """%u module(s) failed to be exported, and were not included in
! the package. They are
! %s""" % (len(failed), makeNiceList(failed))