[Bug 228836] sysutils/py-salt : bugfix for 2018.3.0 [maintainer]

[bugzilla-noreply at freebsd.org]

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=228836

Christer Edwards <christer.edwards at gmail.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
 Attachment #194085|                            |maintainer-approval+
              Flags|                            |

--- Comment #1 from Christer Edwards <christer.edwards at gmail.com> ---
Comment on attachment 194085
  --> https://bugs.freebsd.org/bugzilla/attachment.cgi?id=194085
patch

>diff -ruN sysutils/py-salt/Makefile local/py-salt-2018.3.0_2/Makefile
>--- sysutils/py-salt/Makefile	2018-04-25 15:01:46.000000000 -0600
>+++ local/py-salt-2018.3.0_2/Makefile	2018-06-08 19:18:13.852487000 -0600
>@@ -3,8 +3,8 @@
>
> PORTNAME=	salt
> PORTVERSION=	2018.3.0
>-PORTREVISION=	1
>-CATEGORIES=	sysutils python
>+PORTREVISION=	2
>+CATEGORIES=	sysutils python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>
>diff -ruN sysutils/py-salt/files/patch-salt_modules_freebsdservice.py local/py-salt-2018.3.0_2/files/patch-salt_modules_freebsdservice.py
>--- sysutils/py-salt/files/patch-salt_modules_freebsdservice.py	1969-12-31 17:00:00.000000000 -0700
>+++ local/py-salt-2018.3.0_2/files/patch-salt_modules_freebsdservice.py	2018-06-08 19:17:16.687925000 -0600
>@@ -0,0 +1,11 @@
>+--- salt/modules/freebsdservice.py	2018-06-08 19:14:43.986965000 -0600
>++++ salt/modules/freebsdservice.py	2018-06-08 19:15:09.970086000 -0600
>+@@ -225,7 +225,7 @@
>+     if os.path.exists(config):
>+         with salt.utils.files.fopen(config, 'r') as ifile:
>+             for line in ifile:
>+-                line = salt.utils.stringutils.to_unicode(line).rstrip('\n')
>++                line = salt.utils.stringutils.to_unicode(line)
>+                 if not line.startswith('{0}='.format(rcvar)):
>+                     nlines.append(line)
>+                     continue

-- 
You are receiving this mail because:
You are the assignee for the bug.