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)

2 files changed, 93 insertions, 0 deletions

diff --git a/sysutils/py-salt/Makefile b/sysutils/py-salt/Makefile
index e4e8ca07ce92..ae66d97c872a 100644
--- a/sysutils/py-salt/Makefile
+++ b/sysutils/py-salt/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	salt
 PORTVERSION=	2017.7.2
+PORTREVISION=	1
 CATEGORIES=	sysutils python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/sysutils/py-salt/files/patch-salt_modules_pkgng.py b/sysutils/py-salt/files/patch-salt_modules_pkgng.py
new file mode 100644
index 000000000000..84015e2ea480
--- /dev/null
+++ b/sysutils/py-salt/files/patch-salt_modules_pkgng.py
@@ -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=<jail name or id>
+-        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=<jail name or id>
++
++    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
+     )