[DRE-commits] [schleuder] 18/26: debian/patches/foo: ok

[Georg Faerber]

This is an automated email from the git hooks/post-receive script.

georg-alioth-guest pushed a commit to branch master
in repository schleuder.

commit 9573f2a6ef8cec8566f66b97c3afef8afc3990c9
Author: Georg Faerber <georg at riseup.net>
Date:   Tue Jan 31 16:17:49 2017 +0100

    debian/patches/foo: ok
---
 debian/patches/foo | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/debian/patches/foo b/debian/patches/foo
index 55605d0..ae71146 100644
--- a/debian/patches/foo
+++ b/debian/patches/foo
@@ -21,7 +21,7 @@
  
    context '#refresh_keys' do
      it 'updates one key from the keyserver' do
-+      listdir = '/tmp/schleuder-test/'
++      listdir = '/tmp/schleuder-test'
 +      FileUtils.mkdir_p(listdir)
 +      gpghome_upstream = File.join "spec", "gnupg"
 +      FileUtils.cp_r Dir["#{gpghome_upstream}/{*.conf,private*,*.gpg,.*migrated}"], listdir
@@ -40,7 +40,7 @@
      end
  
      it 'reports errors from refreshing keys' do
-+      listdir = '/tmp/schleuder-test/'
++      listdir = '/tmp/schleuder-test'
 +      FileUtils.mkdir_p(listdir)
 +      gpghome_upstream = File.join "spec", "gnupg"
 +      FileUtils.cp_r Dir["#{gpghome_upstream}/{*.conf,private*,*.gpg,.*migrated}"], listdir
@@ -59,3 +59,18 @@
      end
    end
  end
+--- a/lib/schleuder/gpgme/ctx.rb
++++ b/lib/schleuder/gpgme/ctx.rb
+@@ -48,8 +48,10 @@
+       keys.each do |key|
+         args = "#{base_args} #{key.fingerprint}"
+         err, gpgout, _ = gpgcli(args)
+-        gpgout = filter_gpgcli_output(gpgout)
+-        output << filter_gpgcli_output(err)
++        #gpgout = filter_gpgcli_output(gpgout)
++        #output << filter_gpgcli_output(err)
++	gpgout = gpgout
++	output << err
+         # Add any gpgkeys-message (gpg 2.0 writes those messages to stdout).
+         # Those could e.g. report a failure to connect to the keyserver.
+         output << gpgout.select { |line| line.match(/^gpgkeys: .*$/) }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/schleuder.git