Changeset b83b8ed3 in tol for tolbase/lib/toltk/tolpkg.tcl

Timestamp:

Feb 8, 2012, 6:41:22 PM (15 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

8bbfd4d

Parents:

72b4d96

Message:

refs #1417, se corrige un error cuando la ruta de instalación de los paquetes tiene espacio en el nombre, más traducciones

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@4080 be4846ae-f051-483a-831f-b64e7d08527f

File:

• tolbase/lib/toltk/tolpkg.tcl (modified) (4 diffs)

tolbase/lib/toltk/tolpkg.tcl

@@ -25 +25 @@
 }
 
+proc ::TolPkg::GetLocalRoot { } {
+  return [ file normalize \
+               [ lindex [ toltcl::eval { Text TolPackage::_.localRoot } ] 0 ] ]
+}
+
+proc ::TolPkg::GetClientPath { } {
+  return [ file join [ GetLocalRoot ] "Client" ]
+}
+
 proc ::TolPkg::GetPkgDirectory { p } {
-  set localRoot [ file normalize \
-                      [ toltcl::eval { Text TolPackage::_.localRoot } ] ]
-  return [ file join $localRoot "Client" $p ]
+  return [ file join [ GetClientPath ] $p ]
 }
 
@@ -67 +74 @@
 
 proc ::TolPkg::GetPkgSyncInfo { } {
-  set localRoot [ file normalize \
-                      [ toltcl::eval { Text TolPackage::_.localRoot } ] ]
-  set oza [ file join $localRoot "Client/PackSyncInfo.oza" ]
+  set oza [ file join [ GetClientPath ] "PackSyncInfo.oza" ]
   if { ![ file exists $oza ] || ![ file readable $oza ] } {
     return {}
@@ -108 +113 @@
 
 proc ::TolPkg::GetVersSyncInfo { } {
-  set localRoot [ file normalize \
-                      [ toltcl::eval { Text TolPackage::_.localRoot } ] ]
-  set oza [ file join $localRoot "Client/VersSyncInfo.oza" ]
+  set oza [ file join [ GetClientPath ] "VersSyncInfo.oza" ]
   if { ![ file exists $oza ] || ![ file readable $oza ] } {
     return {}
@@ -138 +141 @@
 
 proc ::TolPkg::GetLocalPackages { } {
-  set localRoot [ file normalize \
-                      [ lindex [ toltcl::eval { Text TolPackage::_.localRoot } ] 0 ] ]
-  set clientRoot [ file join $localRoot Client ]
+  set clientRoot [ GetClientPath ]
   set dirs [ glob -nocomplain -tail -dir $clientRoot -types {d r} * ]
   set pkgsInfo {}