From owner-svn-ports-all@freebsd.org Thu Dec 28 08:53:54 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B98EDE8152C; Thu, 28 Dec 2017 08:53:54 +0000 (UTC) (envelope-from woodsb02@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9368672233; Thu, 28 Dec 2017 08:53:54 +0000 (UTC) (envelope-from woodsb02@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vBS8rrKo008039; Thu, 28 Dec 2017 08:53:53 GMT (envelope-from woodsb02@FreeBSD.org) Received: (from woodsb02@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vBS8rrP2008037; Thu, 28 Dec 2017 08:53:53 GMT (envelope-from woodsb02@FreeBSD.org) Message-Id: <201712280853.vBS8rrP2008037@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: woodsb02 set sender to woodsb02@FreeBSD.org using -f From: Ben Woods Date: Thu, 28 Dec 2017 08:53:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r457439 - in head/sysutils/py-salt: . files X-SVN-Group: ports-head X-SVN-Commit-Author: woodsb02 X-SVN-Commit-Paths: in head/sysutils/py-salt: . files X-SVN-Commit-Revision: 457439 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Dec 2017 08:53:54 -0000 Author: woodsb02 Date: Thu Dec 28 08:53:53 2017 New Revision: 457439 URL: https://svnweb.freebsd.org/changeset/ports/457439 Log: sysutils/py-salt: Patch module pkgng to fix pkg.clean and pkg.upgrade These have been committed upstream: https://github.com/saltstack/salt/commit/f70ca0f91d722647c7bf528204f56e01835ba1b9 https://github.com/saltstack/salt/commit/348342f4eb8803f3c31e8b21fd59130facb89a93 PR: 224594 Approved by: Christer Edwards (maintainer) Added: head/sysutils/py-salt/files/patch-salt_modules_pkgng.py (contents, props changed) Modified: head/sysutils/py-salt/Makefile Modified: head/sysutils/py-salt/Makefile ============================================================================== --- head/sysutils/py-salt/Makefile Thu Dec 28 05:06:35 2017 (r457438) +++ head/sysutils/py-salt/Makefile Thu Dec 28 08:53:53 2017 (r457439) @@ -3,6 +3,7 @@ PORTNAME= salt PORTVERSION= 2017.7.2 +PORTREVISION= 1 CATEGORIES= sysutils python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} Added: head/sysutils/py-salt/files/patch-salt_modules_pkgng.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/py-salt/files/patch-salt_modules_pkgng.py Thu Dec 28 08:53:53 2017 (r457439) @@ -0,0 +1,92 @@ +--- salt/modules/pkgng.py.orig 2017-10-09 16:37:42 UTC ++++ salt/modules/pkgng.py +@@ -1154,8 +1154,6 @@ def upgrade(*names, **kwargs): + opts += 'n' + if not dryrun: + opts += 'y' +- if opts: +- opts = '-' + opts + + cmd = _pkg(jail, chroot, root) + cmd.append('upgrade') +@@ -1181,7 +1179,11 @@ def upgrade(*names, **kwargs): + return ret + + +-def clean(jail=None, chroot=None, root=None): ++def clean(jail=None, ++ chroot=None, ++ root=None, ++ clean_all=False, ++ dryrun=False): + ''' + Cleans the local cache of fetched remote packages + +@@ -1190,11 +1192,64 @@ def clean(jail=None, chroot=None, root=None): + .. code-block:: bash + + salt '*' pkg.clean +- salt '*' pkg.clean jail= +- salt '*' pkg.clean chroot=/path/to/chroot ++ ++ jail ++ Cleans the package cache in the specified jail ++ ++ CLI Example: ++ ++ .. code-block:: bash ++ ++ salt '*' pkg.clean jail= ++ ++ chroot ++ Cleans the package cache in the specified chroot (ignored if ``jail`` ++ is specified) ++ ++ root ++ Cleans the package cache in the specified root (ignored if ``jail`` ++ is specified) ++ ++ CLI Example: ++ ++ .. code-block:: bash ++ ++ salt '*' pkg.clean chroot=/path/to/chroot ++ ++ clean_all ++ Clean all packages from the local cache (not just those that have been ++ superseded by newer versions). ++ ++ CLI Example: ++ ++ .. code-block:: bash ++ ++ salt '*' pkg.clean clean_all=True ++ ++ dryrun ++ Dry-run mode. This list of changes to the local cache is always ++ printed, but no changes are actually made. ++ ++ CLI Example: ++ ++ .. code-block:: bash ++ ++ salt '*' pkg.clean dryrun=True + ''' ++ opts = '' ++ if clean_all: ++ opts += 'a' ++ if dryrun: ++ opts += 'n' ++ else: ++ opts += 'y' ++ ++ cmd = _pkg(jail, chroot, root) ++ cmd.append('clean') ++ if opts: ++ cmd.append('-' + opts) + return __salt__['cmd.run']( +- _pkg(jail, chroot, root) + ['clean'], ++ cmd, + output_loglevel='trace', + python_shell=False + )