Changeset c363c8ff in tol

Timestamp:

Jun 4, 2012, 1:55:38 PM (14 years ago)

Author:

Pedro Gea <pgea@…>

Branches:

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

Children:

3e5b4f1

Parents:

293e01a

Message:

Refs #1549
(Trunk) Se tienen ...

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

Location:

tol/stdlib/TolPackage

Files:

• client.tol (modified) (2 diffs)
• def_catalog.tol (modified) (1 diff)

tol/stdlib/TolPackage/client.tol

@@ -136 +136 @@
     Real OSDirRemove(folder);
     Real PackArchive::UnpackFull("ZipArchive", folder, True);
-    FileExist(folder<<"/"<<packageName+".oza")
+    If(FileExist(folder<<"/"<<packageName+".oza"), {
+      Real UpdateCatalog(?);
+    1}, 0)
   };
 
@@ -166 +168 @@
     Set dir = GetDir(_.localRoot)[2];
     Set sel = EvalSet(GetDir(_.localRoot)[2], Real (Text subdir) {
-      If(TextMatch(subdir ,txtPattern), OSDirRemove(_.localRoot<<subdir), 0)
+      If(TextMatch(subdir ,txtPattern), {
+        Real OSDirRemove(_.localRoot<<subdir);
+      1}, 0)
     });
-    If(Card(sel), SetSum(sel), 0)
+    If(Card(sel), {
+      Real UpdateCatalog(?);
+      SetSum(sel)
+    }, 0)
   };
 

tol/stdlib/TolPackage/def_catalog.tol

@@ -75 +75 @@
           If(TextLength(msg), msg<<" y", " para")<<" la fecha "<<date
         });
-        WriteLn("[[TolPackage::@Catalog "<<_.type
+        WriteLn("[TolPackage::@Catalog "<<_.type
           <<"] No se encuentra el paquete '"<<pattern<<"'"<<msg2<<".", wm);
           ""