Changeset 293e01a in tol

Timestamp:

Jun 1, 2012, 3:30:23 PM (14 years ago)

Author:

Pedro Gea <pgea@…>

Branches:

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

Children:

c363c8ff

Parents:

63ef228

Message:

Refs #1549
(en trunk) Se actualiza el ...

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

Location:

tol/stdlib/TolPackage

Files:

• common.tol (modified) (2 diffs)
• def_catalog.tol (modified) (1 diff)
• server.tol (modified) (1 diff)

tol/stdlib/TolPackage/common.tol

@@ -46 +46 @@
       Unique(TolConfigManager::Config::Upgrading::TolPackage::Repositories <<
       [[url]]);
-    TolConfigManager::SaveConfig(TolConfigManager::Config)
+    Real TolConfigManager::SaveConfig(TolConfigManager::Config);
+    Real Server::GetCatalog(?)::Update(?)
   };
 
@@ -250 +251 @@
   };
 
-
-  ////////////////////////////////////////////////////////////////////////////
+  ////////////////////////////////////////////////////////////////////////////

tol/stdlib/TolPackage/def_catalog.tol

@@ -336 +336 @@
   ////////////////////////////////////////////////////////////////////////////
   {
-    Set rows = SetConcat(EvalSet(repositories, Set (Text repository) {
+    Set repositories_ = If(Card(repositories), repositories,
+      TolConfigManager::Config::Upgrading::TolPackage::Repositories);
+    Set rows = SetConcat(EvalSet(repositories_, Set (Text repository) {
       Text urlAnswer = GetUrlContents(repository
         <<"?tol_package_version=1.1&action=versions");

tol/stdlib/TolPackage/server.tol

@@ -300 +300 @@
       // [A] Se construye el catálogo remoto
       Real t1 = Copy(Time);
-      Set _.catalog := [[ @Catalog::Remote(TolConfigManager::Config
-        ::Upgrading::TolPackage::Repositories) ]];
+      Set _.catalog := [[ @Catalog::Remote(Empty) ]];
       Real t2 = Copy(Time);
       Real t21 = Round((t2 -t1)*100)/100;