Bug 228836 - sysutils/py-salt : bugfix for 2018.3.0 [maintainer]
Summary: sysutils/py-salt : bugfix for 2018.3.0 [maintainer]
Status: Closed Not Accepted
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Only Me
Assignee: freebsd-ports-bugs (Nobody)
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2018-06-09 01:35 UTC by Christer Edwards
Modified: 2018-06-09 01:42 UTC (History)
0 users

See Also:

Attachments
patch (1.33 KB, text/plain)
2018-06-09 01:35 UTC, Christer Edwards 		christer.edwards: maintainer-approval+
Details
View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Christer Edwards 2018-06-09 01:35:55 UTC 
Created attachment 194085 [details]
patch

This patch applies a small fix to the freebsdservice.py SaltStack module that caused the upstream bug described here: https://github.com/saltstack/salt/issues/47502, https://github.com/saltstack/salt/issues/48036.
Comment 1 Christer Edwards 2018-06-09 01:36:55 UTC 
Comment on attachment 194085 [details]
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
Comment 2 Christer Edwards 2018-06-09 01:37:25 UTC 
Comment on attachment 194085 [details]
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=	local 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
Comment 3 Christer Edwards 2018-06-09 01:39:01 UTC 
Comment on attachment 194085 [details]
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
>+PORTREVISION=	2
> 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
Comment 4 Christer Edwards 2018-06-09 01:42:54 UTC 
Resubmitting.