Index: client/1.0/neutral/pkgr.eagle ================================================================== --- client/1.0/neutral/pkgr.eagle +++ client/1.0/neutral/pkgr.eagle @@ -400,10 +400,14 @@ variable openPgpInstalledDirectory if {[catch {openPgpMustBeInstalled}] == 0} then { return true } + + if {![info exists openPgpFileNameOnly]} then { + return false + } if {![info exists openPgpInstalledDirectory]} then { return false } @@ -423,14 +427,10 @@ if {![file isdirectory $directory]} then { return false } - if {![info exists openPgpFileNameOnly]} then { - return false - } - set fileName [file join $directory $openPgpFileNameOnly] if {[file exists $fileName] && [file isfile $fileName]} then { return [addToPath $directory] } @@ -530,10 +530,14 @@ # # proc verifyOpenPgpSignature { fileName } { variable openPgpFileNameOnly variable openPgpVerifyCommand + + if {![info exists openPgpFileNameOnly]} then { + return false + } if {[isEagle]} then { set fileName [formatExecArgument $fileName] if {[catch { @@ -636,10 +640,14 @@ # proc createOpenPgpSignature { fileName } { global env variable openPgpFileNameOnly variable openPgpSignCommand + + if {![info exists openPgpFileNameOnly]} then { + return false + } if {[isEagle]} then { set fileName [formatExecArgument $fileName] if {[catch { @@ -671,10 +679,14 @@ # proc importOpenPgpKeyFile { fileName varName } { variable openPgpFileNameOnly variable openPgpImportCommand variable openPgpImportPattern + + if {![info exists openPgpFileNameOnly]} then { + return false + } if {[string length $varName] > 0} then { upvar 1 $varName result }