summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2020-02-14 11:20:47 +0000
committerColin Watson <cjwatson@debian.org>2020-02-14 11:21:03 +0000
commitd697b761f262e673adca68dc91dac8f11dfa3bf3 (patch)
tree610ed0ac0f6f566c969a2d4ed8879e8f7dbde417
parent80445ffb67dff6b89f493e7fc9f3720b4e2b78b6 (diff)
parente988151f336cac8970d6904a76bf53bccb237920 (diff)
Update upstream source from tag 'upstream/1.3.1'
Update to upstream version '1.3.1' with Debian dir 9f815bfd57fd8747c50b510cb5b76af586cb3f17
-rw-r--r--PKG-INFO2
-rw-r--r--debian/changelog6
-rw-r--r--macaroonbakery.egg-info/PKG-INFO2
-rw-r--r--macaroonbakery/bakery/_macaroon.py4
-rwxr-xr-xsetup.py4
5 files changed, 12 insertions, 6 deletions
diff --git a/PKG-INFO b/PKG-INFO
index 7e4987e..a3c2272 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: macaroonbakery
-Version: 1.3.0
+Version: 1.3.1
Summary: A Python library port for bakery, higher level operation to work with macaroons
Home-page: https://github.com/go-macaroon-bakery/py-macaroon-bakery
Author: Juju UI Team
diff --git a/debian/changelog b/debian/changelog
index 2a6b577..c81ec2c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+py-macaroon-bakery (1.3.1-1) UNRELEASED; urgency=medium
+
+ * New upstream release.
+
+ -- Colin Watson <cjwatson@debian.org> Fri, 14 Feb 2020 11:20:56 +0000
+
py-macaroon-bakery (1.3.0-1) unstable; urgency=medium
* New upstream release.
diff --git a/macaroonbakery.egg-info/PKG-INFO b/macaroonbakery.egg-info/PKG-INFO
index 7e4987e..a3c2272 100644
--- a/macaroonbakery.egg-info/PKG-INFO
+++ b/macaroonbakery.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: macaroonbakery
-Version: 1.3.0
+Version: 1.3.1
Summary: A Python library port for bakery, higher level operation to work with macaroons
Home-page: https://github.com/go-macaroon-bakery/py-macaroon-bakery
Author: Juju UI Team
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:
diff --git a/setup.py b/setup.py
index d549aa5..4cf63f0 100755
--- a/setup.py
+++ b/setup.py
@@ -10,8 +10,8 @@ from setuptools import (
PROJECT_NAME = 'macaroonbakery'
-# version 1.3.0
-VERSION = (1, 3, 0)
+# version 1.3.1
+VERSION = (1, 3, 1)
def get_version():