From owner-freebsd-ports-bugs@freebsd.org Sat Jun 9 01:37:27 2018 Return-Path: Delivered-To: freebsd-ports-bugs@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6D906FF0906 for ; Sat, 9 Jun 2018 01:37:27 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: from mailman.ysv.freebsd.org (mailman.ysv.freebsd.org [IPv6:2001:1900:2254:206a::50:5]) by mx1.freebsd.org (Postfix) with ESMTP id E44207C9C8 for ; Sat, 9 Jun 2018 01:37:26 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: by mailman.ysv.freebsd.org (Postfix) id A3F6FFF0900; Sat, 9 Jun 2018 01:37:26 +0000 (UTC) Delivered-To: ports-bugs@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7F020FF08FE for ; Sat, 9 Jun 2018 01:37:26 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: from mxrelay.ysv.freebsd.org (mxrelay.ysv.freebsd.org [IPv6:2001:1900:2254:206a::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.ysv.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 1B8D67C9BF for ; Sat, 9 Jun 2018 01:37:26 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: from kenobi.freebsd.org (kenobi.freebsd.org [IPv6:2001:1900:2254:206a::16:76]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.ysv.freebsd.org (Postfix) with ESMTPS id 5E509A96A for ; Sat, 9 Jun 2018 01:37:25 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: from kenobi.freebsd.org ([127.0.1.118]) by kenobi.freebsd.org (8.15.2/8.15.2) with ESMTP id w591bPGg034359 for ; Sat, 9 Jun 2018 01:37:25 GMT (envelope-from bugzilla-noreply@freebsd.org) Received: (from www@localhost) by kenobi.freebsd.org (8.15.2/8.15.2/Submit) id w591bPCJ034358 for ports-bugs@FreeBSD.org; Sat, 9 Jun 2018 01:37:25 GMT (envelope-from bugzilla-noreply@freebsd.org) X-Authentication-Warning: kenobi.freebsd.org: www set sender to bugzilla-noreply@freebsd.org using -f From: bugzilla-noreply@freebsd.org To: ports-bugs@FreeBSD.org Subject: [Bug 228836] sysutils/py-salt : bugfix for 2018.3.0 [maintainer] Date: Sat, 09 Jun 2018 01:37:25 +0000 X-Bugzilla-Reason: AssignedTo X-Bugzilla-Type: changed X-Bugzilla-Watch-Reason: None X-Bugzilla-Product: Ports & Packages X-Bugzilla-Component: Individual Port(s) X-Bugzilla-Version: Latest X-Bugzilla-Keywords: X-Bugzilla-Severity: Affects Only Me X-Bugzilla-Who: christer.edwards@gmail.com X-Bugzilla-Status: New X-Bugzilla-Resolution: X-Bugzilla-Priority: --- X-Bugzilla-Assigned-To: ports-bugs@FreeBSD.org X-Bugzilla-Flags: X-Bugzilla-Changed-Fields: Message-ID: In-Reply-To: References: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Bugzilla-URL: https://bugs.freebsd.org/bugzilla/ Auto-Submitted: auto-generated MIME-Version: 1.0 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Jun 2018 01:37:27 -0000 https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D228836 --- Comment #2 from Christer Edwards --- 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 local 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.=