Changeset a052615 in tol

Timestamp:

Jun 10, 2010, 1:59:10 PM (16 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

f916644

Parents:

cf6d1c6

Message:

Fixes #897

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

File:

• tol/lang/language.cpp (modified) (8 diffs)

tol/lang/language.cpp

@@ -1316 +1316 @@
 
 //--------------------------------------------------------------------
-  BText BPackage::LocalPath(const BText& package)
-//--------------------------------------------------------------------
-{
-  BText path = localRoot_+package+".oza";
+  BText BPackage::LocalPath(const BText& package_version)
+//--------------------------------------------------------------------
+{
+  BText path = localRoot_+package_version+".oza";
   return(path);
 }
 
 //--------------------------------------------------------------------
-  BText BPackage::Url(const BText& package)
-//--------------------------------------------------------------------
-{
-  BText url = urlRoot_+package+".oza";
+  BText BPackage::Url(const BText& package_version)
+//--------------------------------------------------------------------
+{
+  BText url = urlRoot_+package_version+".oza";
   return(url);  
 }
 
 //--------------------------------------------------------------------
-  bool BPackage::CleanLocal(const BText& package)
-//--------------------------------------------------------------------
-{
-  return(BSys::Remove(LocalPath(package)));  
-}
-
-//--------------------------------------------------------------------
-  bool BPackage::Install(const BText& package)
-//--------------------------------------------------------------------
-{
-  BText path = LocalPath(package);
-  BText url = Url(package);
+  bool BPackage::CleanLocal(const BText& package_version)
+//--------------------------------------------------------------------
+{
+  return(BSys::Remove(LocalPath(package_version)));  
+}
+
+//--------------------------------------------------------------------
+  bool BPackage::Install(const BText& package_version)
+//--------------------------------------------------------------------
+{
+  BText path = LocalPath(package_version);
+  BText url = Url(package_version);
   BSys::MkDir(localRoot_,true);
   BText order = BText("wget ")+
@@ -1349 +1349 @@
     "-O\""+ReplaceSlash(path)+"\"";
   Std(I2("Installing required package ",
-         "Instalando el paquete requerido ")+package+"\n"+order+"\n");
+         "Instalando el paquete requerido ")+package_version+"\n"+order+"\n");
   #ifdef UNIX
   system(order);
@@ -1362 +1362 @@
     Error(I2("Cannot install empty package ",
              "No se puede instalar el paquete vacío ")+
-          package+"\n"+help_);
+          package_version+"\n"+help_);
   }
   return(ok);  
@@ -1368 +1368 @@
 
 //--------------------------------------------------------------------
-  BSyntaxObject* BPackage::Load(const BText& package, bool retry)
-//--------------------------------------------------------------------
-{
+  BSyntaxObject* BPackage::Load(
+    const BText& package_version, 
+    bool retry)
+//--------------------------------------------------------------------
+{
+  BText package, version;
+  int point = package_version.Find(".",1);
+  if(point<0)
+  {
+    package = package_version;
+  }
+  else
+  {
+    package = package_version.SubString(0,point-1);
+    version = package_version.SubString(point+1,package_version.Length()-1);
+  }
   BSyntaxObject* pkg = GraNameBlock()->FindOperand(package,false);
   bool ok = pkg!=NULL;
-  BText path = LocalPath(package);
+  BText path = LocalPath(package_version);
   BDir dir = path;
   if(!ok)
   {
     ok=dir.Exist();
-    if(!ok) { ok = Install(package); }
+    if(!ok) { ok = Install(package_version); }
     if(ok)
     {
@@ -1403 +1416 @@
   if(!ok)
   {
-    BText path = LocalPath(package);
-    BText url = Url(package);
+    BText path = LocalPath(package_version);
+    BText url = Url(package_version);
     if(dir.Exist())
     {
@@ -1411 +1424 @@
       {
         Error(I2("Corrupted package ",
-                 "El paquete corrupto ")+package+
+                 "El paquete corrupto ")+package_version+
               I2(" has been locally removed ",
                  " ha sido eliminado localmente ")+
@@ -1417 +1430 @@
                  "y será reinstalado desde ")+
               url);
-        return(Load(package, false));
+        return(Load(package_version, false));
       } 
       else
       {
         Error(I2("Corrupted package ",
-                 "El paquete corrupto ")+package+
+                 "El paquete corrupto ")+package_version+
               I2(" has been locally removed ",
                  " ha sido eliminado localmente ")+
@@ -1432 +1445 @@
     help = help_;
   }
-  Std(load+I2(" package ", " el paquete ")+package+"\n"+help);
+  Std(load+I2(" package ", " el paquete ")+package_version+"\n"+help);
   if(pkg)
   {