Check-in [c469dd85b7]
Not logged in
Overview
Comment:Make sure that 'glob' command results are processed in a well-defined order.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | vNext
Files: files | file ages | folders
SHA1: c469dd85b7b862df824e11f3241228879193e48a
User & Date: test on 2022-02-20 18:20:21
Other Links: branch diff | manifest | tags
Context
2022-03-02
20:43
Merge various recent fixes and enhancements to the package client toolset. check-in: 372ee60877 user: mistachkin tags: trunk
2022-02-20
18:20
Make sure that 'glob' command results are processed in a well-defined order. Closed-Leaf check-in: c469dd85b7 user: test tags: vNext
16:47
Minor default value fix. check-in: 1936fa886c user: test tags: vNext
Changes

Modified client/1.0/neutral/pkgd.eagle from [a45b3861fd] to [82758d27ca].

575
576
577
578
579
580
581
582
583
584
585
586
587
588
589

    if {[file exists $pkgd(file)]} then {
      set dir $pkgd(dir); source $pkgd(file)
    }
  }

  eval lappend pkgd(dirs) \
      [glob -nocomplain -types {d} [file join $pkgd(dir) *]]
}

set dir $pkgd(savedDir); unset -nocomplain pkgd
    }]]

    return ""
  }







|







575
576
577
578
579
580
581
582
583
584
585
586
587
588
589

    if {[file exists $pkgd(file)]} then {
      set dir $pkgd(dir); source $pkgd(file)
    }
  }

  eval lappend pkgd(dirs) \
      [lsort [glob -nocomplain -types {d} [file join $pkgd(dir) *]]]
}

set dir $pkgd(savedDir); unset -nocomplain pkgd
    }]]

    return ""
  }
2269
2270
2271
2272
2273
2274
2275
2276
2277
2278
2279
2280
2281
2282
2283
2284
2285
2286
2287
2288
    set packageIndexFileNameOnly [getPackageIndexFileName $language]

    #
    # HACK: Obtain the list of candidate temporary package directories
    #       that may need to be added to the auto-path.  The prefix we
    #       use here is considered "well-known" by this package.
    #
    set directories(1) [glob -nocomplain -types {d} \
        [file join $temporaryRootDirectory pkgd_lib_*]]

    foreach directory(1) $directories(1) {
      set directories(2) [glob -nocomplain -types {d} \
          [file join $directory(1) *]]

      foreach directory(2) $directories(2) {
        set directoryNameOnly(2) [file tail $directory(2)]
        set packageName $directoryNameOnly(2); # HACK: Well-known.

        if {[lsearch -exact $packageNames $packageName] == -1} then {
          if {[string length $pattern] == 0 || \







|
|


|
|







2269
2270
2271
2272
2273
2274
2275
2276
2277
2278
2279
2280
2281
2282
2283
2284
2285
2286
2287
2288
    set packageIndexFileNameOnly [getPackageIndexFileName $language]

    #
    # HACK: Obtain the list of candidate temporary package directories
    #       that may need to be added to the auto-path.  The prefix we
    #       use here is considered "well-known" by this package.
    #
    set directories(1) [lsort [glob -nocomplain -types {d} \
        [file join $temporaryRootDirectory pkgd_lib_*]]]

    foreach directory(1) $directories(1) {
      set directories(2) [lsort [glob -nocomplain -types {d} \
          [file join $directory(1) *]]]

      foreach directory(2) $directories(2) {
        set directoryNameOnly(2) [file tail $directory(2)]
        set packageName $directoryNameOnly(2); # HACK: Well-known.

        if {[lsearch -exact $packageNames $packageName] == -1} then {
          if {[string length $pattern] == 0 || \

Modified client/1.0/neutral/pkgr.eagle from [3dcc4235ec] to [96aebd6a2c].

2301
2302
2303
2304
2305
2306
2307
2308
2309
2310
2311
2312
2313
2314
2315
      }
    }

    if {$count == 0} then {
      set pattern [file join $scriptPath [appendArgs \
          $scriptRootName .settings.* $scriptExtension]]

      foreach fileName [glob -nocomplain -- $pattern] {
        #
        # BUGFIX: Do not consider any settings script file
        #         that may have already been evaluated via
        #         the above list(s) of script prefixes.
        #
        set fileNameOnly [file tail $fileName]








|







2301
2302
2303
2304
2305
2306
2307
2308
2309
2310
2311
2312
2313
2314
2315
      }
    }

    if {$count == 0} then {
      set pattern [file join $scriptPath [appendArgs \
          $scriptRootName .settings.* $scriptExtension]]

      foreach fileName [lsort [glob -nocomplain -- $pattern]] {
        #
        # BUGFIX: Do not consider any settings script file
        #         that may have already been evaluated via
        #         the above list(s) of script prefixes.
        #
        set fileNameOnly [file tail $fileName]