CVS: sidai/package-utils tooldoc,1.4,1.5

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

Update of /cvsroot/ark/sidai/package-utils
In directory sc8-pr-cvs1:/tmp/cvs-serv7584/package-utils

Modified Files:
	tooldoc 
Log Message:
updates

Index: tooldoc
===================================================================
RCS file: /cvsroot/ark/sidai/package-utils/tooldoc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** tooldoc	13 Feb 2003 13:51:36 -0000	1.4
--- tooldoc	31 Mar 2003 09:32:46 -0000	1.5
***************
*** 131,134 ****
--- 131,135 ----
  def rootDirs(pkg):
      pkg_namespaces = pkg.file_namespaces()
+     #print >> sys.stderr, 'pkg=',pkg, 'pkg_namespaces=',`pkg_namespaces`
      assert(len(pkg_namespaces) > 0)
      pkg_namespace_deploy_map = pkg.namespace_deploy_map()
***************
*** 151,163 ****
      # multiple versions need choosing from:
      if versions[0] == None:
!         to_lookup1 = pkgname
!         to_lookup2 = pkgname + '-wrapper'
      else:
!         to_lookup1 = "%s--%s"%(pkgname,versions[0])
!         to_lookup2 = to_lookup1
      try:
          pkg = pkgsMgr.lookup(to_lookup1) # pick one...
      except ark.error.NoSuchThing:
          pkg = pkgsMgr.lookup(to_lookup2)
      (reveal_root_dir, deploy_root_dir) = rootDirs(pkg)
  
--- 152,168 ----
      # multiple versions need choosing from:
      if versions[0] == None:
! 	# important to prefer the wrapper one; the wrapper
! 	# and non-wrapper ones may appear in diff namespaces!
!         to_lookup1 = pkgname + '-wrapper'
!         to_lookup2 = pkgname
      else:
!         to_lookup1 = pkgname + '-wrapper' # see above
!         to_lookup2 = "%s--%s"%(pkgname,versions[0])
      try:
          pkg = pkgsMgr.lookup(to_lookup1) # pick one...
+         #print >> sys.stderr,'going with pkg:',pkg.idString
      except ark.error.NoSuchThing:
          pkg = pkgsMgr.lookup(to_lookup2)
+         #print >> sys.stderr,'going with pkg(2):',pkg.idString
      (reveal_root_dir, deploy_root_dir) = rootDirs(pkg)