summaryrefslogtreecommitdiff
path: root/macaroonbakery/bakery
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2020-02-14 11:20:46 +0000
committerColin Watson <cjwatson@debian.org>2020-02-14 11:20:46 +0000
commite988151f336cac8970d6904a76bf53bccb237920 (patch)
tree142e4de27defafaa3a2b34d50350a488a8d8698b /macaroonbakery/bakery
parent1f71066d3cd63e829ce094b1298873b0e34ae204 (diff)
New upstream version 1.3.1
Diffstat (limited to 'macaroonbakery/bakery')
-rw-r--r--macaroonbakery/bakery/_macaroon.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/macaroonbakery/bakery/_macaroon.py b/macaroonbakery/bakery/_macaroon.py
index 63091f6..1438ab1 100644
--- a/macaroonbakery/bakery/_macaroon.py
+++ b/macaroonbakery/bakery/_macaroon.py
@@ -115,11 +115,11 @@ class Macaroon(object):
'no private key to encrypt third party caveat')
local_info = _parse_local_location(cav.location)
if local_info is not None:
- info = local_info
- if cav.condition is not '':
+ if cav.condition:
raise ValueError(
'cannot specify caveat condition in '
'local third-party caveat')
+ info = local_info
cav = checkers.Caveat(location='local', condition='true')
else:
if loc is None: