Changeset fa3cded in tol

Timestamp:

Jun 16, 2011, 8:17:26 AM (15 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

9180d52

Parents:

8aa53ad

Message:

Fixes #1257
Fixes #1258

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

File:

• tol/stdlib/general/TolPackage/client.tol (modified) (17 diffs)

tol/stdlib/general/TolPackage/client.tol

@@ -26 +26 @@
 Set _.packInstalled = Copy(Empty);
 
-Text common_php_arguments = "";
+Text _common_php_arguments = "";
 
 Real  trace_max_level = 0;
@@ -52 +52 @@
   Real _trace("Initialize", "Begin", 1);
   Real TolPackage::Initialize(void);
-  Text common_php_arguments := 
+  Text _common_php_arguments := 
     "tol_package_version="<<TolPackage::_.version+
     "&tol_version="+Replace(TolPackage::_.currentTolVersion," ","%20");
@@ -253 +253 @@
   {
     Real key = IntRand(111111111,999999999);
-    Set info = GetRepositoryInfo(url+"?"+common_php_arguments+
+    Set info = GetRepositoryInfo(url+"?"+_common_php_arguments+
       "&action=ping&key="<<key);
     Real ok = Case(
@@ -294 +294 @@
     {
     //WriteLn("_trace [GetMinTolVersionForPackage] 4 repositories["<<k+"]="<<repositories[k]);
-      Set pkgLst = GetRepositoryInfo(repositories[k]+"?"+common_php_arguments+
+      Set pkgLst = GetRepositoryInfo(repositories[k]+"?"+_common_php_arguments+
         "&action=versions&limit=1&package="+package);
     //WriteLn("_trace [GetMinTolVersionForPackage] 5 pkgInfo="<<pkgInfo);
@@ -329 +329 @@
     {
     //WriteLn("_trace [GetMaxTolVersionForPackage] 4 repositories["<<k+"]="<<repositories[k]);
-      Set pkgLst = GetRepositoryInfo(repositories[k]+"?"+common_php_arguments+
+      Set pkgLst = GetRepositoryInfo(repositories[k]+"?"+_common_php_arguments+
         "&action=versions&limit=1&package="+package);
     //WriteLn("_trace [GetMaxTolVersionForPackage] 5 pkgInfo="<<pkgInfo);
@@ -368 +368 @@
     {
     //WriteLn("_trace [RemoteFindRepository] 4 repositories["<<k+"]="<<repositories[k]);
-      Set pkgLst = GetRepositoryInfo(repositories[k]+"?"+common_php_arguments+
+      Set pkgLst = GetRepositoryInfo(repositories[k]+"?"+_common_php_arguments+
         "&action=versions&limit=1&package="+package);
     //WriteLn("_trace [RemoteFindRepository] 6 pkgLst="<<pkgLst);
@@ -398 +398 @@
     If(rep=="", UnknownDate,
     {
-      Set pkgLst = GetRepositoryInfo(rep+"?"+common_php_arguments+
+      Set pkgLst = GetRepositoryInfo(rep+"?"+_common_php_arguments+
         "&action=versions&limit=1&package="+package);
       If(!Card(pkgLst), TheEnd,
@@ -430 +430 @@
       pkg.tok.num==2, pkg.tok[1]+"."+pkg.tok[2], 
       pkg.tok.num==1, pkg.tok[1]); 
-    Set pkgLst = GetRepositoryInfo(repository+"?"+common_php_arguments+
+    Set pkgLst = GetRepositoryInfo(repository+"?"+_common_php_arguments+
       "&action=versions&limit=1&package="+package.version);
     Real ok := Card(pkgLst);
@@ -448 +448 @@
     Text localDir = localRoot+"/"+package.version;
 
-    Text encoded = GetUrlContents(repository+"?"+common_php_arguments+
+    Text encoded = GetUrlContents(repository+"?"+_common_php_arguments+
       "&action=download"+
       "&format=base64"+
@@ -504 +504 @@
   Real ok = If(!ChecktolProjectPing(?), 0, 
   {
-    Set pkgLst = GetRepositoryInfo(repository+"?"+common_php_arguments+
+    Set pkgLst = GetRepositoryInfo(repository+"?"+_common_php_arguments+
       "&action=versions");
     If(!Card(pkgLst), False,
@@ -615 +615 @@
     Set _.versSyncInfo := SetConcat(EvalSet(repositories,Set(Text rep)
     {
-      GetRepositoryInfo(rep+"?"+common_php_arguments+"&action=versions")
+      GetRepositoryInfo(rep+"?"+_common_php_arguments+"&action=versions")
     }));
     Real SetIndexByName(_.versSyncInfo);
@@ -662 +662 @@
     Set _.packSyncInfo := SetConcat(EvalSet(repositories,Set ev.rep(Text rep)
     {
-      GetRepositoryInfo(rep+"?"+common_php_arguments+"&action=packages")
+      GetRepositoryInfo(rep+"?"+_common_php_arguments+"&action=packages")
     }));
     Real SetIndexByName(_.packSyncInfo);
@@ -807 +807 @@
   Real If(!Card(_.versSyncInfo), 
    TolPackage::Client::RemoteUpdateVersSyncInfo(True));
-
+  
   Set sel_compatible = Select(_.versSyncInfo, 
   Real(TolPackage::@VersionSynchro reg)
   {
-    And(reg->co_name==package, 
+    And(TextBeginWith(reg->co_name_version,package), 
         tol_version>=reg->te_min_tol_version, 
         tol_version<=reg->te_max_tol_version)
   });
-
-  Set last_compatible = Sort(sel_compatible, 
-  Real(TolPackage::@VersionSynchro a, TolPackage::@VersionSynchro b)
-  {
-    Compare.VersionString(b->co_name_version,a->co_name_version)
-  })[1];
-  Real _trace("GetCompatibleVersion.one", "End", 1);
-  last_compatible->co_name_version
+  If(!Card(sel_compatible),
+  {
+    WriteLn("[GetCompatibleVersion.one] Cannot find a version of package "<<
+    package+" compatible with TOL "+tol_version,"E");
+    Real Stop;
+    ""
+  },
+  {
+    Set last_compatible = Sort(sel_compatible, 
+    Real(TolPackage::@VersionSynchro a, TolPackage::@VersionSynchro b)
+    {
+      Compare.VersionString(b->co_name_version,a->co_name_version)
+    })[1];
+    Real _trace("GetCompatibleVersion.one", "End", 1);
+    last_compatible->co_name_version
+  })
 };
 
@@ -844 +852 @@
 ////////////////////////////////////////////////////////////////////////////////
 {
-  Real _trace("GetDeepDependencies.one", "Begin", 1);
+  Real _trace("GetDeepDependencies.one("+package.version+")", "Begin", 1);
   Real If(!Card(_.versSyncInfo), 
    TolPackage::Client::RemoteUpdateVersSyncInfo(True));
@@ -870 +878 @@
 ////////////////////////////////////////////////////////////////////////////////
 {
-  Unique(SetConcat(EvalSet(package.version.list, GetDeepDependencies.one)))
+  Real _trace("GetDeepDependencies.all", "Begin", 1);
+  Set tab = EvalSet(package.version.list, GetDeepDependencies.one);
+  Set uni = Unique(SetConcat(tab));
+  Real _trace("GetDeepDependencies.all", "End", 1);
+  uni
 };
 
@@ -897 +909 @@
 ////////////////////////////////////////////////////////////////////////////////
 {
+  Real _trace("GetCompatibleDeepDependencies", "Begin", 1);
   Set package.version.list = GetCompatibleVersion.all(tol_version, package.list);
-  GetVersionInfo(GetDeepDependencies.all(package.version.list))
+  Set dep = GetVersionInfo(GetDeepDependencies.all(package.version.list));
+  Real _trace("GetCompatibleDeepDependencies", "End", 2);
+  dep
 };
 
@@ -919 +934 @@
 {
   Real _trace("DownloadCompatibleDeepDependencies", "Begin", 1);
-  Real If(cleanLocalRoot, OSDirRemove(localRoot));
-  Set dep = GetCompatibleDeepDependencies(tol_version, package.list);
-  Real ok = SetMin(EvalSet(dep, Real(TolPackage::@VersionSynchro vsi)
-  {
-    DownloadPackage(vsi->te_url,vsi->co_name_version,True,localRoot)
-  }));
-  Real _trace("DownloadCompatibleDeepDependencies", "End", 1);
-  ok
+  If(tol_version>TolPackage::_.currentTolVersion,
+  {
+    WriteLn("[DownloadCompatibleDeepDependencies] Cannot download packages for "
+    "TOL "+tol_version+" using TOL "+TolPackage::_.currentTolVersion,"E");
+    False
+  },
+  {
+    Real If(cleanLocalRoot, OSDirRemove(localRoot));
+    Set dep = GetCompatibleDeepDependencies(tol_version, package.list);
+    Real ok = SetMin(EvalSet(dep, Real(TolPackage::@VersionSynchro vsi)
+    {
+      DownloadPackage(vsi->te_url,vsi->co_name_version,True,localRoot)
+    }));
+    Real _trace("DownloadCompatibleDeepDependencies", "End", 1);
+    ok
+  })
 };