Date: Sat, 09 Jun 2018 01:36:55 +0000 From: bugzilla-noreply@freebsd.org To: ports-bugs@FreeBSD.org Subject: [Bug 228836] sysutils/py-salt : bugfix for 2018.3.0 [maintainer] Message-ID: <bug-228836-7788-nnTs5ZMG2h@https.bugs.freebsd.org/bugzilla/> In-Reply-To: <bug-228836-7788@https.bugs.freebsd.org/bugzilla/> References: <bug-228836-7788@https.bugs.freebsd.org/bugzilla/>
next in thread | previous in thread | raw e-mail | index | archive | help
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D228836 Christer Edwards <christer.edwards@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #194085| |maintainer-approval+ Flags| | --- Comment #1 from Christer Edwards <christer.edwards@gmail.com> --- Comment on attachment 194085 --> https://bugs.freebsd.org/bugzilla/attachment.cgi?id=3D194085 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=3D salt > PORTVERSION=3D 2018.3.0 >-PORTREVISION=3D 1 >-CATEGORIES=3D sysutils python >+PORTREVISION=3D 2 >+CATEGORIES=3D sysutils python > MASTER_SITES=3D CHEESESHOP > PKGNAMEPREFIX=3D ${PYTHON_PKGNAMEPREFIX} > >diff -ruN sysutils/py-salt/files/patch-salt_modules_freebsdservice.py loca= l/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 20= 18-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 =3D salt.utils.stringutils.to_unicode(line).rstrip(= '\n') >++ line =3D salt.utils.stringutils.to_unicode(line) >+ if not line.startswith('{0}=3D'.format(rcvar)): >+ nlines.append(line) >+ continue --=20 You are receiving this mail because: You are the assignee for the bug.=
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?bug-228836-7788-nnTs5ZMG2h>