diff options
| author | Kali Kaneko <kali@leap.se> | 2015-08-03 14:23:22 -0400 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2015-08-03 14:23:22 -0400 |
| commit | e6c89cab3d0660756524d3fe631d4b1f96834b54 (patch) | |
| tree | 51c597da8159663d5b7e86c917b40931b3be6abf /client | |
| parent | 351d393b6e2c98c5573d8afa26f5f4b346cac554 (diff) | |
| parent | 54afb28b372118b0f08d0567b27034dd72fe63e7 (diff) | |
Merge remote-tracking branch 'leapcode/pr/237' into develop
Diffstat (limited to 'client')
| -rw-r--r-- | client/pkg/requirements-latest.pip | 8 | ||||
| -rw-r--r-- | client/src/leap/soledad/client/api.py | 3 |
2 files changed, 9 insertions, 2 deletions
diff --git a/client/pkg/requirements-latest.pip b/client/pkg/requirements-latest.pip new file mode 100644 index 00000000..a629aa57 --- /dev/null +++ b/client/pkg/requirements-latest.pip @@ -0,0 +1,8 @@ +--index-url https://pypi.python.org/simple/ + +--allow-external u1db --allow-unverified u1db +--allow-external dirspec --allow-unverified dirspec + +-e 'git+https://github.com/pixelated-project/leap_pycommon.git@develop#egg=leap.common' +-e '../common' +-e . diff --git a/client/src/leap/soledad/client/api.py b/client/src/leap/soledad/client/api.py index def2841a..a3dfb1d4 100644 --- a/client/src/leap/soledad/client/api.py +++ b/client/src/leap/soledad/client/api.py @@ -213,8 +213,7 @@ class Soledad(object): soledad_assert_type(self._passphrase, unicode) def initialize(attr, val): - return (getattr(self, attr, None) is None - and setattr(self, attr, val)) + return (getattr(self, attr, None) is None and setattr(self, attr, val)) initialize("_secrets_path", os.path.join( self.default_prefix, self.secrets_file_name)) |