From: Peter Palfrader <peter@palfrader.org>
Date: Mon, 18 Jul 2011 14:23:06 +0000 (+0200)
Subject: Add .keyring to keyrings for verifying .users, if the file exists
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1779d694d145fe1d26b2d139cce75576a9bbb19d;p=pwstore

Add .keyring to keyrings for verifying .users, if the file exists
---

diff --git a/pws b/pws
index b81da23..13c6783 100755
--- a/pws
+++ b/pws
@@ -232,7 +232,9 @@ class GroupConfig
       trusted.push line
     end
 
-    (outtxt, stderrtxt, statustxt, exitstatus) = GnuPG.gpgcall(content, %w{})
+    args = []
+    args.push "--keyring=./.keyring" if FileTest.exists?(".keyring")
+    (outtxt, stderrtxt, statustxt, exitstatus) = GnuPG.gpgcall(content, args)
     goodsig = false
     validsig = nil
     statustxt.split("\n").each do |line|