Diff
Not logged in

Differences From Artifact [c59f9c8fa4]:

To Artifact [de1c724aac]:


1254
1255
1256
1257
1258
1259
1260


1261
1262
1263
1264

1265
1266
1267




1268
1269
1270

1271
1272
1273




1274
1275
1276
1277
1278
1279
1280
1281
1282
1283
1284
1285
1286


1287
1288
1289

1290
1291
1292




1293
1294
1295
1296
1297

1298
1299
1300




1301
1302
1303
1304
1305
1306

1307
1308
1309
1310





1311
1312
1313
1314
1315

1316
1317
1318




1319
1320
1321
1322
1323
1324
1325
1254
1255
1256
1257
1258
1259
1260
1261
1262
1263
1264
1265
1266
1267



1268
1269
1270
1271
1272
1273
1274
1275



1276
1277
1278
1279
1280
1281
1282
1283
1284
1285
1286
1287
1288
1289
1290
1291
1292
1293
1294
1295
1296
1297
1298



1299
1300
1301
1302
1303
1304
1305
1306
1307
1308



1309
1310
1311
1312
1313
1314
1315
1316
1317
1318
1319




1320
1321
1322
1323
1324
1325
1326
1327
1328
1329
1330



1331
1332
1333
1334
1335
1336
1337
1338
1339
1340
1341







+
+




+
-
-
-
+
+
+
+



+
-
-
-
+
+
+
+













+
+



+
-
-
-
+
+
+
+





+
-
-
-
+
+
+
+






+
-
-
-
-
+
+
+
+
+





+
-
-
-
+
+
+
+







  # NOTE: This procedure returns non-zero if the specified package appears to
  #       be present.  The package argument is the name of the package being
  #       sought, it cannot be an empty string.  The version argument must be
  #       a specific version -OR- a package specification that conforms to TIP
  #       #268.
  #
  proc isPackagePresent { package version } {
    variable verboseUnknownResult

    set command [list package present $package]
    if {[string length $version] > 0} then {lappend command $version}

    if {[set code [catch $command result]] == 0} then {
      if {$verboseUnknownResult} then {
      pkgLog [appendArgs \
          "package \"" [formatPackageName $package $version] \
          "\" was loaded: " [formatResult $code $result]]
        pkgLog [appendArgs \
            "package \"" [formatPackageName $package $version] \
            "\" was loaded: " [formatResult $code $result]]
      }

      return true
    } else {
      if {$verboseUnknownResult} then {
      pkgLog [appendArgs \
          "package \"" [formatPackageName $package $version] \
          "\" was not loaded: " [formatResult $code $result]]
        pkgLog [appendArgs \
            "package \"" [formatPackageName $package $version] \
            "\" was not loaded: " [formatResult $code $result]]
      }

      return false
    }
  }

  #
  # NOTE: This procedure returns non-zero if the specified package appears to
  #       be available.  The package argument is the name of the package being
  #       sought, it cannot be an empty string.  The version argument must be
  #       a specific version -OR- a package specification that conforms to TIP
  #       #268.
  #
  proc isPackageAvailable { package version } {
    variable verboseUnknownResult

    set packageVersions [package versions $package]

    if {[llength $packageVersions] == 0} then {
      if {$verboseUnknownResult} then {
      pkgLog [appendArgs \
          "package \"" [formatPackageName $package $version] \
          "\" is not available: no versions"]
        pkgLog [appendArgs \
            "package \"" [formatPackageName $package $version] \
            "\" is not available: no versions"]
      }

      return false
    }

    if {[string length $version] == 0} then {
      if {$verboseUnknownResult} then {
      pkgLog [appendArgs \
          "package \"" [formatPackageName $package $version] \
          "\" is available: no version"]
        pkgLog [appendArgs \
            "package \"" [formatPackageName $package $version] \
            "\" is available: no version"]
      }

      return true
    }

    foreach packageVersion $packageVersions {
      if {[package vsatisfies $packageVersion $version]} then {
        if {$verboseUnknownResult} then {
        pkgLog [appendArgs \
            "package \"" [formatPackageName $package $version] \
            "\" is available: version satisfied by \"" \
            [formatPackageName $package $packageVersion] \"]
          pkgLog [appendArgs \
              "package \"" [formatPackageName $package $version] \
              "\" is available: version satisfied by \"" \
              [formatPackageName $package $packageVersion] \"]
        }

        return true
      }
    }

    if {$verboseUnknownResult} then {
    pkgLog [appendArgs \
        "package \"" [formatPackageName $package $version] \
        "\" is not available: version not satisfied"]
      pkgLog [appendArgs \
          "package \"" [formatPackageName $package $version] \
          "\" is not available: version not satisfied"]
    }

    return false
  }

  #
  # NOTE: This procedure returns non-zero if the specified package can be
  #       downloaded, i.e. because it is not required for the downloading
1482
1483
1484
1485
1486
1487
1488
1489
1490





1491
1492
1493
1494
1495








1496
1497
1498
1499
1500
1501
1502
1498
1499
1500
1501
1502
1503
1504


1505
1506
1507
1508
1509





1510
1511
1512
1513
1514
1515
1516
1517
1518
1519
1520
1521
1522
1523
1524







-
-
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+







      pkgLog [appendArgs \
          "initial saved handler results for package \"" \
          [formatPackageName $package $version] "\" are " \
          [formatResult $code(1) $result(1)]]
    }

    #
    # NOTE: If the saved [package unknown] handler succeeded -AND- the
    #       package can now be loaded (or is somehow already loaded?),
    # NOTE: Did the saved [package unknown] handler succeed?
    #
    if {$code(1) == 0} then {
      #
      # NOTE: Is the package now available -OR- somehow already present?
    #       then skip running the repository handler.
    #
    if {$code(1) == 0 && ([isPackagePresent $package $version] || \
        [isPackageAvailable $package $version])} then {
      return
      #
      if {[isPackagePresent $package $version] || \
          [isPackageAvailable $package $version]} then {
        #
        # NOTE: Skip using the package repository.
        #
        return
      }
    }

    #
    # NOTE: Next, run our special [package unknown] handler.
    #
    if {[canDownloadPackage $package]} then {
      set code(2) [catch {