CVS: sidai/license-settings license-settings.tmpl,1.1,1.2

[Will P. <pa...@us...>]

Update of /cvsroot/ark/sidai/license-settings
In directory sc8-pr-cvs1:/tmp/cvs-serv15167/license-settings

Modified Files:
	license-settings.tmpl 
Log Message:
updates

Index: license-settings.tmpl
===================================================================
RCS file: /cvsroot/ark/sidai/license-settings/license-settings.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** license-settings.tmpl	25 Sep 2002 19:45:26 -0000	1.1
--- license-settings.tmpl	21 Mar 2003 18:23:00 -0000	1.2
***************
*** 36,41 ****
  envvar = {}
  
! for license in ark.license.ArkLicensesMgr().unpackSpecs(['ALL']):
!     if license.status() not in ['pending', 'active']: continue
      if not license.appliesToHost(thishost): continue
  
--- 36,42 ----
  envvar = {}
  
! lic_chooser = lambda l:l.isRelevant(pending_too=1)
! 
! for license in ark.license.ArkLicensesMgr().unpackSpecs(['ALL'],chooser=lic_chooser):
      if not license.appliesToHost(thishost): continue
  
***************
*** 72,77 ****
  import string
  
! for pkg in ark.package.ArkPkgsMgr().unpackSpecs(['ALL']):
!     if pkg.status() in ['pending', 'deprecated']: continue # ToDo: tighter?
      if not pkg.appliesToHost(thishost): continue
      try:
--- 73,79 ----
  import string
  
! lic_chooser = lambda l:l.isRelevant(pending_too=1)
! 
! for pkg in ark.package.ArkPkgsMgr().unpackSpecs(['ALL'],chooser=lic_chooser):
      if not pkg.appliesToHost(thishost): continue
      try: