diff options
author | Jason Unovitch <junovitch@FreeBSD.org> | 2016-06-26 00:42:55 +0000 |
---|---|---|
committer | Jason Unovitch <junovitch@FreeBSD.org> | 2016-06-26 00:42:55 +0000 |
commit | 71f55866a12e7317324a7210a486ee4fd26f1639 (patch) | |
tree | a994b1670d95120317013986f7dbe8ad0e5267fd /sysutils/py-salt/files | |
parent | net-mgmt/lldpd: update 0.9.2 -> 0.9.4 (diff) |
sysutils/py-salt: update 2016.3.0 -> 2016.3.1
- Remove patches accepted upstream
Changes: https://docs.saltstack.com/en/latest/topics/releases/2016.3.1.html
PR: 210395
Submitted by: Christer Edwards <christer.edwards@gmail.com> (maintainer)
Notes
Notes:
svn path=/head/; revision=417508
Diffstat (limited to 'sysutils/py-salt/files')
4 files changed, 0 insertions, 109 deletions
diff --git a/sysutils/py-salt/files/patch-salt_grains_core.py b/sysutils/py-salt/files/patch-salt_grains_core.py deleted file mode 100644 index 04794a04deff..000000000000 --- a/sysutils/py-salt/files/patch-salt_grains_core.py +++ /dev/null @@ -1,12 +0,0 @@ -# Issue #33608 -# https://github.com/saltstack/salt/issues/33608 ---- salt/grains/core.py.orig 2016-05-25 22:30:31 UTC -+++ salt/grains/core.py -@@ -1422,6 +1422,7 @@ def os_data(): - else: - grains['os'] = grains['kernel'] - if grains['kernel'] == 'FreeBSD': -+ grains.update(_bsd_cpudata(grains)) - try: - grains['osrelease'] = __salt__['cmd.run']('freebsd-version -u').split('-')[0] - except salt.exceptions.CommandExecutionError: diff --git a/sysutils/py-salt/files/patch-salt_grains_disks.py b/sysutils/py-salt/files/patch-salt_grains_disks.py deleted file mode 100644 index d10ce2a3e411..000000000000 --- a/sysutils/py-salt/files/patch-salt_grains_disks.py +++ /dev/null @@ -1,51 +0,0 @@ ---- salt/grains/disks.py.orig 2016-05-25 22:30:31 UTC -+++ salt/grains/disks.py -@@ -57,18 +57,27 @@ class _geomconsts(object): - - _datatypes = { - MEDIASIZE: ('re_int', r'(\d+)'), -- SECTORSIZE: 'int', -- STRIPESIZE: 'int', -- STRIPEOFFSET: 'int', -- ROTATIONRATE: 'int', -+ SECTORSIZE: 'try_int', -+ STRIPESIZE: 'try_int', -+ STRIPEOFFSET: 'try_int', -+ ROTATIONRATE: 'try_int', - } - - - def _datavalue(datatype, data): -- if datatype == 'int': -- return int(data) -- elif datatype and datatype[0] == 're_int': -- return int(re.search(datatype[1], data).group(1)) -+ if datatype == 'try_int': -+ try: -+ return int(data) -+ except ValueError: -+ return None -+ elif datatype is tuple and datatype[0] == 're_int': -+ search = re.search(datatype[1], data) -+ if search: -+ try: -+ return int(search.group(1)) -+ except ValueError: -+ return None -+ return None - else: - return data - -@@ -97,9 +106,11 @@ def _freebsd_geom(): - tmp[_geomconsts._aliases[attrib]] = value - - name = tmp.pop(_geomconsts.GEOMNAME) -+ if name.startswith('cd'): -+ return - - ret['disks'][name] = tmp -- if tmp[_geomconsts.ROTATIONRATE] == 0: -+ if tmp.get(_geomconsts.ROTATIONRATE) == 0: - log.trace('Device {0} reports itself as an SSD'.format(device)) - ret['SSDs'].append(name) - diff --git a/sysutils/py-salt/files/patch-salt_modules_pkgng.py b/sysutils/py-salt/files/patch-salt_modules_pkgng.py deleted file mode 100644 index 5200adc32a34..000000000000 --- a/sysutils/py-salt/files/patch-salt_modules_pkgng.py +++ /dev/null @@ -1,24 +0,0 @@ ---- salt/modules/pkgng.py.orig 2016-05-25 22:30:31 UTC -+++ salt/modules/pkgng.py -@@ -97,7 +97,8 @@ def _get_pkgng_version(jail=None, chroot - ''' - return the version of 'pkg' - ''' -- return __salt__['cmd.run']([_pkg(jail, chroot), '--version']).strip() -+ cmd = _pkg(jail, chroot) + ['--version'] -+ return __salt__['cmd.run'](cmd).strip() - - - def _get_version(name, results): -@@ -287,9 +288,9 @@ def latest_version(*names, **kwargs): - for name in names: - # FreeBSD supports packages in format java/openjdk7 - if '/' in name: -- cmd = [_pkg(jail, chroot), 'search'] -+ cmd = _pkg(jail, chroot) + ['search'] - else: -- cmd = [_pkg(jail, chroot), 'search', '-S', 'name', '-Q', 'version', '-e'] -+ cmd = _pkg(jail, chroot) + ['search', '-S', 'name', '-Q', 'version', '-e'] - if quiet: - cmd.append('-q') - cmd.append(name) diff --git a/sysutils/py-salt/files/patch-salt_returners_local__cache.py b/sysutils/py-salt/files/patch-salt_returners_local__cache.py deleted file mode 100644 index fa9e45050dcd..000000000000 --- a/sysutils/py-salt/files/patch-salt_returners_local__cache.py +++ /dev/null @@ -1,22 +0,0 @@ -# Issue #33554 -# https://github.com/saltstack/salt/issues/33554 ---- salt/returners/local_cache.py.orig 2016-05-25 22:30:31 UTC -+++ salt/returners/local_cache.py -@@ -407,14 +407,14 @@ def clean_old_jobs(): - for final in t_path_dirs: - f_path = os.path.join(t_path, final) - jid_file = os.path.join(f_path, 'jid') -- if not os.path.isfile(jid_file): -+ if not os.path.isfile(jid_file) and os.path.exists(t_path): - # No jid file means corrupted cache entry, scrub it - # by removing the entire t_path directory - shutil.rmtree(t_path) -- else: -+ elif os.path.isfile(jid_file): - jid_ctime = os.stat(jid_file).st_ctime - hours_difference = (cur - jid_ctime) / 3600.0 -- if hours_difference > __opts__['keep_jobs']: -+ if hours_difference > __opts__['keep_jobs'] and os.path.exists(t_path): - # Remove the entire t_path from the original JID dir - shutil.rmtree(t_path) - |