Overview
| Comment: | Add comments and robustify error logging. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
54f7833d58e394d1b72c390a4f8452d4 |
| User & Date: | mistachkin on 2016-08-15 18:45:36 |
| Other Links: | manifest | tags |
Context
|
2016-08-15
| ||
| 19:46 | The ampersand character needs to be unescaped in the returned data from the package server. check-in: 306c8151d8 user: mistachkin tags: trunk | |
| 18:45 | Add comments and robustify error logging. check-in: 54f7833d58 user: mistachkin tags: trunk | |
| 18:30 | Add support for hooking the 'package unknown' handler in both Tcl and Eagle. check-in: 3bc512e10f user: mistachkin tags: trunk | |
Changes
Modified client/pkgr.eagle from [051495fc84] to [7dbde3e417].
| ︙ | ︙ | |||
454 455 456 457 458 459 460 461 462 463 464 |
error "package unknown handler is not hooked"
}
package unknown [set $varName]
unset $varName
}
proc packageUnknownHandler { package {version ""} } {
if {[catch {main $package $version} error(1)] == 0} then {
return
} else {
| > > > > > > > > > > > > > > | | | | | > > > > > > > > > > > > > | | | > > > > > | 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 |
error "package unknown handler is not hooked"
}
package unknown [set $varName]
unset $varName
}
#
# NOTE: This version argument to this procedure must be optional, because
# Eagle does not add a version argument when one is not supplied to
# the [package require] sub-command itself.
#
proc packageUnknownHandler { package {version ""} } {
if {[catch {main $package $version} error(1)] == 0} then {
#
# NOTE: Success? Just return and let Tcl (or Eagle) handle the
# rest.
#
return
} else {
#
# NOTE: Failure? Attempt to log the error message and then maybe
# try the original [package unknown] handler.
#
catch {
tclLog [appendArgs \
"pkgr: new handler failed for \"" [appendArgs [string \
trim $package " " $version]] "\", error: " $error(1)]
}
}
#
# NOTE: See if there is a saved [package unknown] handler. If so, we
# will attempt to use it.
#
set varName [appendArgs [getLookupVarNamePrefix] saved_package_unknown]
if {[info exists $varName]} then {
set oldHandler [set $varName]
} else {
set oldHandler ""
}
if {[string length $oldHandler] > 0} then {
lappend oldHandler $package $version
if {[catch {uplevel #0 $oldHandler} error(2)] == 0} then {
#
# NOTE: Success? Just return and let Tcl (or Eagle) handle the
# rest.
#
return
} else {
#
# NOTE: Failure? Attempt to log the error message.
#
catch {
tclLog [appendArgs \
"pkgr: old handler failed for \"" [appendArgs [string \
trim $package " " $version]] "\", error: " $error(2)]
}
}
}
#
# NOTE: Both [package unknown] handlers failed in some way, return the
# error messages (i.e. both of them).
#
error [array get error]
}
proc main { package version } {
#
# NOTE: Issue the lookup request to the remote package repository.
#
|
| ︙ | ︙ |
Modified client/pkgr.eagle.harpy from [c88d48d019] to [f9b6a94173].
| ︙ | ︙ | |||
17 18 19 20 21 22 23 |
THE ASSOCIATED SOFTWARE MAY NOT WORK PROPERLY IF THIS FILE IS ALTERED.
-->
<Certificate xmlns="https://eagle.to/2011/harpy"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<Protocol>None</Protocol>
<Vendor>Mistachkin Systems</Vendor>
| | | | | | | | | | | | | | | | | | | | | | 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 |
THE ASSOCIATED SOFTWARE MAY NOT WORK PROPERLY IF THIS FILE IS ALTERED.
-->
<Certificate xmlns="https://eagle.to/2011/harpy"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<Protocol>None</Protocol>
<Vendor>Mistachkin Systems</Vendor>
<Id>3dd85612-5d05-4672-bc84-a6c6db8cedc1</Id>
<HashAlgorithm>SHA512</HashAlgorithm>
<EntityType>Script</EntityType>
<TimeStamp>2016-08-15T18:45:09.9343281Z</TimeStamp>
<Duration>-1.00:00:00</Duration>
<Key>0x2c322765603b5278</Key>
<Signature>
YN1fI3cYStP4rS+b04zlCBL/H3HxMGy2hSl1QrTAK1lIitQpvhDeFIlXgwswoMGuCHNcBQ+b7xUw
1yt1ftxxbfgUoEjPMYuAHn1YMxnkn2HLez/0AfO5CT1jG+nK0/X/Yafc4p+VvDqkbEGzPfx3NTdp
Xk7DSxIPBwtDHsZaBkDWNeoLur3MWFNxK7jIBfh4OEMb01lOTLnv1UQydhzhdqy0CiyeTB7PRzCj
zPjdY/SFnjEgiahtyqFqxwfmMdAenLMODie2aP5/a+oPdxkykVjslR8xvsoT5MrOJLONBlAV6xPR
dLJ32yIRa/6FZ4jAptXWncVVlDsTmJKcefJe3Dlakr8f/nIwfWTMH+rKxpXKdpBw7s8T46rF3ka5
2MR+wSaZhQssE14jUOe4yHmG3AQABGcs/sEGLcsummFNaKe9HF2OYhLu+w5Um+skibCOW0iADC5K
vS8p2Z+skvdosHWjefSKWFme0ZQH7KwlJXYAPUaTWpMwPKvxSEf5Ek9Nu60ua9KvqGzqc6j2Kcw6
fL2C7lbMfx5e8d8kReOy7C6svmmVyv1/GLI4UYIcUjkuh5nQp5mIUZrAbImdfWw3D135pl/7iuN5
RK8FCr/cfMGJkeTBtutMWogjhx6qjHqb5Lp6nJnzlVlYm4qBBNVn2sFFMuWiuVnldl/+eD/ltDDX
5ihRMwW5wlxrQj4FFmF2NKw5uvTRCxbMvGmeE6Jvutao0OsRtWe6A3BZnvnfKsNy2MtXtgvsdtrz
3ttm0Uq2a8C1ie4hf4a2zqetIO3kD9r2QQrhYauL1H4FRY7qQZMpYc2taBb1AnS2MiaM6bOiI4mO
fd6jyeUED11WK0C/P+Y1JT0kSW/tYTgfuA7otv/ZMsTZExR8ZSB7SfbLtycsm0UsPZ6Coz9qo7Vm
uY0QJRXVyy6D3vfIkutlCstPm5yBbSy150+t8/8r7226AOimhQunKG/9f3CzVIMPxuvWKQ4Fuqop
7drFlTWCIEh6vvuMEPMtFwl3EB2SnRkSJ9Uv73641V/6QaUOG2CH7hpW11v6vouGKa60me0ZYiQ9
BIxKqPL0HjeBfukj2dvek+49uwKYnQHKgmQegCBuQlvoc13qzXrW0/I7MdAxrk/nG6HkeAiEybiV
coHKntQ9t/jcF+ReyLJ5M/VBtsFxsHvLGFTXg+8DdnznUzqSkAry/fcR1jKd6aG63d0mWOvkNjaf
IpRkAxKhi/0EJYzjeR7i85RGcMuue9rncMZce6k9ltS8rYCGZrXS5acK3gspH/tB9sGIxxE2pAYj
oGGhwcC6A0vNQf055hglcsujmJIsSCfFKC6r7nlSQY5XG/84/Q+1BNajFFFEemgOBPHmI1lHlg==
</Signature>
</Certificate>
|