cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Unbreak mount.active.

Browse Source 
reported by viq
This commit is contained in:
ajacoutot 2016-06-16 08:53:47 +00:00
parent b1dfb78b9e
commit e4b29076a5
2 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sysutils/salt/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.92 2016/06/16 06:30:20 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.93 2016/06/16 08:53:47 ajacoutot Exp $
# optional dependencies
# https://github.com/saltstack/salt/blob/develop/doc/conf.py#L42
@ -17,6 +17,7 @@ COMMENT = remote execution and configuration management system
MODPY_EGG_VERSION = 2016.3.1
DISTNAME = salt-${MODPY_EGG_VERSION}
REVISION = 0
CATEGORIES = sysutils net devel

28
sysutils/salt/patches/patch-salt_modules_mount_py Normal file
View File

@ -0,0 +1,28 @@
$OpenBSD: patch-salt_modules_mount_py,v 1.8 2016/06/16 08:53:47 ajacoutot Exp $
https://github.com/saltstack/salt/pull/34057
--- salt/modules/mount.py.orig Tue Jun 14 00:17:49 2016
+++ salt/modules/mount.py Thu Jun 16 10:39:32 2016
@@ -140,10 +140,10 @@ def _active_mounts_openbsd(ret):
'''
for line in __salt__['cmd.run_stdout']('mount -v').split('\n'):
comps = re.sub(r"\s+", " ", line).split()
- nod = __salt__['cmd.run_stdout']('ls -l {0}'.format(comps[0]))
- nod = ' '.join(nod.split()).split(" ")
parens = re.findall(r'\((.*?)\)', line, re.DOTALL)
if len(parens) > 1:
+ nod = __salt__['cmd.run_stdout']('ls -l {0}'.format(comps[0]))
+ nod = ' '.join(nod.split()).split(" ")
ret[comps[3]] = {'device': comps[0],
'fstype': comps[5],
'opts': _resolve_user_group_names(parens[1].split(", ")),
@@ -153,7 +153,7 @@ def _active_mounts_openbsd(ret):
else:
ret[comps[2]] = {'device': comps[0],
'fstype': comps[4],
- 'opts': _resolve_user_group_names(parens[1].split(", "))}
+ 'opts': _resolve_user_group_names(parens[0].split(", "))}
return ret