1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
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
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
|
Return-Path: <obnam-dev-bounces@obnam.org>
X-Original-To: distix@pieni.net
Delivered-To: distix@pieni.net
Received: from bagpuss.pepperfish.net (bagpuss.pepperfish.net [148.251.8.16])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by pieni.net (Postfix) with ESMTPS id 2303533BC5
for <distix@pieni.net>; Fri, 25 Sep 2015 13:12:36 +0200 (CEST)
Received: from platypus.pepperfish.net (unknown [10.112.100.20])
by bagpuss.pepperfish.net (Postfix) with ESMTP id 7D9D8BCD;
Fri, 25 Sep 2015 12:12:35 +0100 (BST)
Received: from ip6-localhost ([::1] helo=platypus.pepperfish.net)
by platypus.pepperfish.net with esmtp (Exim 4.80 #2 (Debian))
id 1ZfQvb-0007et-CW; Fri, 25 Sep 2015 12:12:35 +0100
Received: from inmail0 ([10.112.100.10] helo=mx0.pepperfish.net)
by platypus.pepperfish.net with esmtp (Exim 4.80 #2 (Debian))
id 1ZfQvZ-0007em-5t
for <obnam-dev@obnam.org>; Fri, 25 Sep 2015 12:12:33 +0100
Received: from mout.kundenserver.de ([212.227.126.131])
by mx0.pepperfish.net with esmtps (TLS1.2:DHE_RSA_AES_256_CBC_SHA256:256)
(Exim 4.80) (envelope-from <lists@sumpfralle.de>) id 1ZfQvX-00078B-DV
for obnam-dev@obnam.org; Fri, 25 Sep 2015 12:12:33 +0100
Received: from erker.lan ([62.141.37.125]) by mrelayeu.kundenserver.de
(mreue004) with ESMTPSA (Nemesis) id 0MYaIg-1aApqj3Kc6-00VPlQ for
<obnam-dev@obnam.org>; Fri, 25 Sep 2015 13:12:19 +0200
Date: Fri, 25 Sep 2015 13:12:18 +0200
From: Lars Kruse <lists@sumpfralle.de>
To: obnam-dev@obnam.org
Message-ID: <20150925131218.50af1dcd@erker.lan>
In-Reply-To: <1443159474-27126-2-git-send-email-mathstuf@gmail.com>
References: <1441948936-12526-1-git-send-email-mathstuf@gmail.com>
<1443159474-27126-1-git-send-email-mathstuf@gmail.com>
<1443159474-27126-2-git-send-email-mathstuf@gmail.com>
X-Mailer: Claws Mail 3.12.0 (GTK+ 2.24.28; i586-pc-linux-gnu)
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
X-Provags-ID: V03:K0:tPSLYy4hEl2QtPA/cQsX9LQjzlq2saDfd4BbY+F1wy9ccecD0OD
e3cs5wn8zViugYW27Vaprnek7AQ+yll+HmiTzMI6gfpvrkLwMV6akxyeXgdpQcQVbsTWuZb
3zeXUNe59TD1hozVtk+MH4aYKUc0u2QnHgvjZar4NoS+GPJ/89gJubE13Bxv57+XQFGJTq6
oXA+mXcqo3EwzI4fPXBcg==
X-UI-Out-Filterresults: notjunk:1;V01:K0:Bg0/0JJmThA=:NV/PRnDJi54fFAUXlr4vTm
e6ts+IzNsHYSYOgm4HPTgM2gxNCgYm6a4eItjxs773Kk+NLQyxchkUp0l6wydGI5zuw/Qs0hR
svUyjm3ikB7Pp5Rivdc1P5m1b8pTtSxY3OEWKZhgbZLGDSib3bRkDvt7CAoDjDgEAUBOLzZV/
42FMOb51VIzEcjtscGF/+7CsWGYPg6q8X1xXXcmAhcXKHsm186dA9VI/BPcOGY5kDp1EEfBiT
TK9Eh0smyfwhjag95A/D8tLgXue2htwH67hAXi55PfcKwQBnPIVpT5BbVZt48nCh7m4wj0YHH
cr4nNMX3jOaL0jL1O3uiE1m1H9hJV+GZz3Jafg1ns95m6XpdZV3loI8xzXcAbvcNixSPFum6j
Z/Fw7x7b1aWUhBV5zAoS2AkNCSxh9MRsW1/VS2hDErkXwB5G6rVvsY0ChD4z2Yz9Kag4WoNka
8tDDl9NJD7yuISVBp0Ufep7aSvbYK/GzKNbyS/k22PYCe+or+Qz9jkTZzt4dsVQBkSu/Vc1wy
1fWaheUOkgGNchkGlKovYqWKeHkb7tGWrqQazR5fM4sZXmt9odpuzrSZ5HPo6c7Tz4wldz2RI
MwHOyusjoJVN9PSeyv1sJaCOqHX6JaEg/cuvSorxOcdlaUZuUQVuOV7Y36clanRq4pSwaByq5
T4o4vEfsyuojEmaTnkSmlLvpvmkgLhTB/UyqRrLP2CviTr4Dbr8nXI8W1FufAGmD7bReYkmVc
qw22TFo50aXoYpte
X-Spam-Score: -2.6
X-Spam-Score-int: -25
X-Spam-Bar: --
X-Scanned-By: pepperfish.net, Fri, 25 Sep 2015 12:12:33 +0100
X-Spam-Report: Content analysis details: (-2.6 points)
pts rule name description
---- ---------------------- --------------------------------------------------
-0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low
trust [212.227.126.131 listed in list.dnswl.org]
-1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1%
[score: 0.0000]
X-ACL-Warn: message may be spam
X-Scan-Signature: 0a5be85a632e689ed6d6910513b654a6
Subject: Re: [PATCH v4 1/4] encryption: refactor _gpg_pipe to use _gpg
X-BeenThere: obnam-dev@obnam.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Obnam development discussions <obnam-dev-obnam.org>
List-Unsubscribe: <http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/obnam-dev-obnam.org>,
<mailto:obnam-dev-request@obnam.org?subject=unsubscribe>
List-Archive: <http://listmaster.pepperfish.net/pipermail/obnam-dev-obnam.org>
List-Post: <mailto:obnam-dev@obnam.org>
List-Help: <mailto:obnam-dev-request@obnam.org?subject=help>
List-Subscribe: <http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/obnam-dev-obnam.org>,
<mailto:obnam-dev-request@obnam.org?subject=subscribe>
Sender: obnam-dev-bounces@obnam.org
Errors-To: obnam-dev-bounces@obnam.org
Hi Ben,
I appreciate the configurable gpg keyring directory without using GNUPGHOME as
introduced by your patch!
Even though I do not really feel entitled to comment on your patch, I feel the
urge to ask a question.
The following lines contain a catch-all except expression:
+ try:
+ out = _gpg(args + ['--passphrase-fd', str(keypipe[0])], stdin=data)
+ except: # pragma: no cover
+ ...
As far as I understand the code of "_gpg", I would expect only OSError
exceptions. Wouldn't it be sufficient to catch only this one?
(catching things like NameError can be very confusing)
cheers,
Lars K.
Am Fri, 25 Sep 2015 01:37:51 -0400
schrieb Ben Boeckel <mathstuf@gmail.com>:
> Signed-off-by: Ben Boeckel <mathstuf@gmail.com>
> ---
> obnamlib/encryption.py | 17 +++++------------
> 1 file changed, 5 insertions(+), 12 deletions(-)
>
> diff --git a/obnamlib/encryption.py b/obnamlib/encryption.py
> index 7030359..d76193c 100644
> --- a/obnamlib/encryption.py
> +++ b/obnamlib/encryption.py
> @@ -90,21 +90,14 @@ def _gpg_pipe(args, data, passphrase):
> os.write(keypipe[1], passphrase + '\n')
> os.close(keypipe[1])
>
> - # Actually run gpg.
> -
> - argv = ['gpg', '--passphrase-fd', str(keypipe[0]), '-q', '--batch',
> - '--no-textmode'] + args
> - tracing.trace('argv=%s', repr(argv))
> - p = subprocess.Popen(argv, stdin=subprocess.PIPE, stdout=subprocess.PIPE,
> - stderr=subprocess.PIPE)
> - out, err = p.communicate(data)
> + try:
> + out = _gpg(args + ['--passphrase-fd', str(keypipe[0])], stdin=data)
> + except: # pragma: no cover
> + os.close(keypipe[0])
> + raise
>
> os.close(keypipe[0])
>
> - # Return output data, or deal with errors.
> - if p.returncode: # pragma: no cover
> - raise GpgError(returncode=p.returncode, stderr=err)
> -
> return out
>
>
_______________________________________________
obnam-dev mailing list
obnam-dev@obnam.org
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/obnam-dev-obnam.org
|
