Attachment 194107 Details for Bug 228843 – diff

diff

py-salt-2018.3.0_2.diff.txt (text/plain), 1.24 KB, created by Christer Edwards on 2018-06-09 18:06:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Christer Edwards

Created: 2018-06-09 18:06:45 UTC

Size: 1.24 KB

patch

obsolete

>diff -ruN py-salt/Makefile py-salt-2018.3.0_2/Makefile
>--- py-salt/Makefile	2018-04-25 15:01:46.000000000 -0600
>+++ py-salt-2018.3.0_2/Makefile	2018-06-09 11:54:01.044025000 -0600
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	salt
> PORTVERSION=	2018.3.0
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	sysutils python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>diff -ruN py-salt/files/patch-salt_modules_freebsdservice.py py-salt-2018.3.0_2/files/patch-salt_modules_freebsdservice.py
>--- py-salt/files/patch-salt_modules_freebsdservice.py	1969-12-31 17:00:00.000000000 -0700
>+++ py-salt-2018.3.0_2/files/patch-salt_modules_freebsdservice.py	2018-06-09 11:54:14.467287000 -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

Actions: View

Attachments on bug 228843: 194107 | 194108