Skip to content

cfs checks #2428

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 4 commits into from
Closed

cfs checks #2428

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e511566
fstype parsing for cifs can fail on Mac OS
afni-dglen Feb 7, 2018
547e2de
fstype parsing for cifs can fail on Mac OS
afni-dglen Feb 7, 2018
a0d48fd
more proper integration
afni-dglen Feb 7, 2018
9e763ba
tab/space fix
afni-dglen Feb 7, 2018
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
17 changes: 16 additions & 1 deletion nipype/utils/filemanip.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,8 +295,23 @@ def _generate_cifs_table():
(line.split()[2:5:2] for line in output.splitlines()),
key=lambda x: len(x[0]),
reverse=True)
cifs_paths = [path for path, fstype in mount_info if fstype == 'cifs']

# find which mount points are CIFS
# init to empty list
cifs_paths = []

try:
for path_and_fstype in mount_info:
# need to check for tables that have only path and no fstype
if len(path_and_fstype) == 2:
# if this entry is cifs, add it to list
if path_and_fstype[1] == 'cifs':
cifs_paths.append(path_and_fstype[0])
else:
fmlogger.debug('mount file system types not described by fstype')
except:
fmlogger.debug('mount file system type check for CIFS error')
return []
return [
mount for mount in mount_info
if any(mount[0].startswith(path) for path in cifs_paths)
Expand Down