Index: client/1.0/pkgr.eagle ================================================================== --- client/1.0/pkgr.eagle +++ client/1.0/pkgr.eagle @@ -1256,23 +1256,29 @@ # 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 { - pkgLog [appendArgs \ - "package \"" [formatPackageName $package $version] \ - "\" was loaded: " [formatResult $code $result]] + if {$verboseUnknownResult} then { + pkgLog [appendArgs \ + "package \"" [formatPackageName $package $version] \ + "\" was loaded: " [formatResult $code $result]] + } return true } else { - pkgLog [appendArgs \ - "package \"" [formatPackageName $package $version] \ - "\" was not loaded: " [formatResult $code $result]] + if {$verboseUnknownResult} then { + pkgLog [appendArgs \ + "package \"" [formatPackageName $package $version] \ + "\" was not loaded: " [formatResult $code $result]] + } return false } } @@ -1282,42 +1288,52 @@ # 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 { - pkgLog [appendArgs \ - "package \"" [formatPackageName $package $version] \ - "\" is not available: no versions"] + if {$verboseUnknownResult} then { + pkgLog [appendArgs \ + "package \"" [formatPackageName $package $version] \ + "\" is not available: no versions"] + } return false } if {[string length $version] == 0} then { - pkgLog [appendArgs \ - "package \"" [formatPackageName $package $version] \ - "\" is available: no version"] + if {$verboseUnknownResult} then { + pkgLog [appendArgs \ + "package \"" [formatPackageName $package $version] \ + "\" is available: no version"] + } return true } foreach packageVersion $packageVersions { if {[package vsatisfies $packageVersion $version]} then { - pkgLog [appendArgs \ - "package \"" [formatPackageName $package $version] \ - "\" is available: version satisfied by \"" \ - [formatPackageName $package $packageVersion] \"] + if {$verboseUnknownResult} then { + pkgLog [appendArgs \ + "package \"" [formatPackageName $package $version] \ + "\" is available: version satisfied by \"" \ + [formatPackageName $package $packageVersion] \"] + } return true } } - pkgLog [appendArgs \ - "package \"" [formatPackageName $package $version] \ - "\" is not available: version not satisfied"] + if {$verboseUnknownResult} then { + pkgLog [appendArgs \ + "package \"" [formatPackageName $package $version] \ + "\" is not available: version not satisfied"] + } return false } # @@ -1484,17 +1500,23 @@ [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?), - # then skip running the repository handler. + # NOTE: Did the saved [package unknown] handler succeed? # - if {$code(1) == 0 && ([isPackagePresent $package $version] || \ - [isPackageAvailable $package $version])} then { - return + if {$code(1) == 0} then { + # + # NOTE: Is the package now available -OR- somehow already present? + # + if {[isPackagePresent $package $version] || \ + [isPackageAvailable $package $version]} then { + # + # NOTE: Skip using the package repository. + # + return + } } # # NOTE: Next, run our special [package unknown] handler. # Index: client/1.0/pkgr.eagle.asc ================================================================== --- client/1.0/pkgr.eagle.asc +++ client/1.0/pkgr.eagle.asc @@ -1,18 +1,18 @@ -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Eagle Package Repository -iQIcBAABCAAGBQJYBbdnAAoJEFAslq9JXcLZxPQP/i4KZZMEwqs+jQfPANo5f8qP -+9ssu+DFplo1Hsap5yt/ny/fLvnKad2BFJyk4H9ZiwDqlW2LRig3Y2TBMLqV79L2 -8f2WOBXQcDeKEYez+pl7DlzIYHrVl8DVnBcBdXpB5HTIiKgQdknR9Zvd3v2cukYd -wLyRY6AgIvFWGKA1zt2+ahKaf6owVhihKN2z6yU7EedpkiqaIiE8thUJ73wKLdZK -jpnYVHo5TQE3t0q2Yd22pE2a9DyxXWXvSvpAwqHEhOiA6i4o9UPfPWyK0vp6h7ch -VB+AE5Ge5oMiZPOlpRo69nKzZ//EGddPm1BKJMEWFIJHAVXD4jEORRIGP/Xjz3JD -GpslFcS/bOdQeiPlI2niKd9r/sIlGqw9BNC2FkVGGdvhfCE1VGlxt7ztY3nhYskm -oCKwu4PWfub5uzi4gm2cqB8/42SMxec7oSersdc53QK+IHHPLHe3DBer8FnfGJ9F -kcLMPcxmSnEqzImgwpoAbDTHODmNkNnMaBOk1Qk1+r8EUHAIN6nTiqTTHDvIGpgz -QhN6K43Pakh4vRI1P4rz5pVNCvdDplVPZqigVqfIbOZuX3rFFf5Fg7UIb/j/ZeRD -39xHRL+mzJE0xaJzx7tAXa6TBiWlWeuvFx/4r7bo+goQRDal375W1HZfML0BzLZ8 -E3OkuWCJzd76JCWX+YiN -=DB2P +iQIcBAABCAAGBQJYBc8YAAoJEFAslq9JXcLZwWIP/0sGpFR/aT7t7CifZSklXuxS +mR8Gfzi19aKE/H/18Rj4IeFUrolwJlnW6ujmSMe7CvLkfyERTDP52lNx95UasmSz +z3xCiP8o/tFNKcCgSHPk2F2lRj8FGKgSSB6YOaTVgIOlzEISR0xoBjryguM4zT5u +navqoq5OsWenro3F95/st0aX1PU/rEDmAR97cl743i8GD+cnTGDd4fmpShQ/aO0P +5xRiiGYSQrXu7abO53YNE/pnTPStShIjoX0tzccrHiqcF+TOZblA2LNNxlyQ4N4F +21rpKU3ucvWWDNyU2AtpOzcmD0qxuQPlW0BQS2pBTfsdv48Ao9hSegAbNKYnL6m7 +45ZuoWMHDCvR594hnI1I4jAN8xrcRiFuYbK4rFAu7ZKKWQg5Cyn3J95CJOJQ+OpP +bFO8pHmGH3obbJ+rTwRdo6CHDqHWdyiTpD9sQ8p/SLE6AOqfh73J6ewT4G/Bi7Np +qdcJjgvLcDwUj0lMKWru4jiuO6KNttMRQjwe5ovteP7nPxySxa/LZTTV2dlxZmxL +E7Og0mlbYGBBReyF+E178XGKR1e6kNV6Zg/XesV238HQguq3MvVlmmylMpiipF6p +eL9NjCPd0iiyjT2EFZENlkIV+ucyJbPfn+91TSc7UhPjyXPuMSFXfrBIGX2Gqb5E +xx6/JKppdzJA+uWEd7qs +=7oE3 -----END PGP SIGNATURE----- Index: client/1.0/pkgr.eagle.harpy ================================================================== --- client/1.0/pkgr.eagle.harpy +++ client/1.0/pkgr.eagle.harpy @@ -19,50 +19,50 @@ None Mistachkin Systems - 19feaf1b-9e2e-4252-a67f-e63356c08eaa + 56c70837-ef83-48bf-9d94-5b0225518222 SHA512 Script - 2016-10-18T05:45:38.6905547Z + 2016-10-18T07:28:03.1622344Z -1.00:00:00 0x9559f6017247e3e2 - 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 Index: client/1.0/pkgr.eagle.harpy.asc ================================================================== --- client/1.0/pkgr.eagle.harpy.asc +++ client/1.0/pkgr.eagle.harpy.asc @@ -1,18 +1,18 @@ -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Eagle Package Repository -iQIcBAABCAAGBQJYBbdpAAoJEFAslq9JXcLZm+AQALTT+dgXi4HXPZU1zs9I9zXE -+L+KL+V7OrCxXOd5XS23q7KJ2GT3omXWnn+OY4Dejer/kU67RuDgPVUmwUs/apAW -39iRzwdVWXPSeC4kd0bjPhN1W0P4ttJXJiT7NuLH6+UI1sEBIdTGCa1k6Vnf+N0b -y6xbZISKPwWUMjnuZPFs/ARpJaPtk4QeDuDwiiglQSzQBnoh/1sktpl8vhGq5C7A -ANKQoDXgSi1RvZgNw4liQ4WsKYWPsrmnSrlQxN0cEm/w6t+ghnp4a34z6bCoYtCz -K9lXDUISqRbPt2m48IUhllULk/MgGAubPR4T7yuBS/oC5nsYT3BqTZcx1/1ih5BH -bWS23u44DcHYkt011aO5t94kZBV9pSXXFKXO6/7NLbZDIt/cVN8czo2Uoe+c4yfq -+HWIql+nKzo7lTPeqaf3w1egoKANbOo+Ye/eXJjGQu99I2oGVNrLY3XF+66LIbm/ -YMu1Uj3qj/1nthcQPfJZRsN/EXAGHkOgAoSfRfFaMkeL7nvD6BcFtdgU5N+uSiKM -sHDYUUKIP7ciZI2MAbVTgCB838/D20rDzbmTBs6y9iEV6guv8PctGhTe9OZFemDS -42YqwqAzlNEmZXqCp7LYulDpFdq7Iu9kbEglBzQFwcIFax1Wlu+J+k0gBC1QpTqi -cz9O31sYB9P/gh2nviKf -=UvlD +iQIcBAABCAAGBQJYBc8aAAoJEFAslq9JXcLZ0KwP/jCx+EpohcA+AoZX4cOdvkpm +X3DAyVcvInxt4UPAG5NUJK3K4sgOHA4Q9kQ9f0jUWxznItQzvfkF1mYJOqLe6irk +QQYDOEajRa5Maxj6gdCrDIKfECvzIlbZ4d5T3dd9WeIMyhkjBO8ZJNea7aS/1mGP +hOqv+PbfFT87dpo+KRw9Us8N7bIg1/uHyWCa1zDgNSa1gmJPJvYfyA26A3fPx/+n +Il9PrNlFS7DopB2G8/caWTSk33z4ayvtxU/9T4tl7DSeaHpisgbyJVlPlQOgQEGL +DN0beBoNxR6W1WQznzxSGiDCqB5vvhV6crnLDALFFoXCqngO2CnDnHtoiOoXpLDT +qVx4U+Qe6jb8f7Y7qkXlR+3cd0NO1F7FJEJhQzWsh5hco7aKrJ5WuShzHP0NDnqQ +dlSUphmPmXpNoMwd7/AtlDVAZj981V+VbMwKpy3bI+SLrk+TnwD24th7j6swGYsF +emifB+sgRoWa9YAr4CfMEUtmYHcCMgCvHxbv1b5g0ueK/LqlXYCMBVrUpRUwrGCu +RL1uWlQCHoBiB6AVaEzwbbo8/9Q6sGO1CCtnnlrFDJ1vLSnT7YDTjL5J1qJHhqp5 +IWbqW9vPhoL29MBqsYoTOy8MeQXJhku7XNsDGTJ5yjgPGILwwKrMeOgBJ0CYKPbO +8Rq7iBob9sTBkfpJepQ3 +=RPia -----END PGP SIGNATURE-----