Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions plugin_config.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
id: 18f4ff11-b758-4bf2-9a37-719a22f5a4b8
name: sc:couchbase
externalVersion: "1.1.2"
buildNumber: 1.1.2.0
externalVersion: "1.1.4"
buildNumber: 1.1.4.0
language: PYTHON27
hostTypes:
- UNIX
Expand Down
2 changes: 1 addition & 1 deletion src/controller/helper_lib.py
Original file line number Diff line number Diff line change
Expand Up @@ -424,7 +424,7 @@ def check_server_is_used(connection, path):
match = re.search(fs_re, i)
if match is not None:
groups = match.groups()
if groups[2] == 'nfs':
if groups[2] and str(groups[2]).startswith('nfs'):
if path == groups[1]:
# this is our mount point - skip it
ret = Status.ACTIVE
Expand Down
2 changes: 1 addition & 1 deletion src/plugin_runner.py
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ def linked_mount_specification(staged_source, repository):

@plugin.linked.pre_snapshot()
def linked_pre_snapshot(staged_source, repository, source_config, optional_snapshot_parameters):
if int(optional_snapshot_parameters.resync) == 1:
if optional_snapshot_parameters and int(optional_snapshot_parameters.resync) == 1:
linked.resync(staged_source, repository, source_config, staged_source.parameters)
else:
linked.pre_snapshot(staged_source, repository, source_config, staged_source.parameters)
Expand Down