From b6b16b1809d8c72f3525463faed52094908ec5c4 Mon Sep 17 00:00:00 2001 From: Olivier Mauras Date: Tue, 11 Oct 2016 23:37:22 +0200 Subject: community/salt: fix pkg.latest_version error in alpine-support --- community/salt/0001-alpine-support.patch | 4 ++-- community/salt/APKBUILD | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'community/salt') diff --git a/community/salt/0001-alpine-support.patch b/community/salt/0001-alpine-support.patch index ac7d7db1d6..01caefea00 100644 --- a/community/salt/0001-alpine-support.patch +++ b/community/salt/0001-alpine-support.patch @@ -2,7 +2,7 @@ Upstream code not yet released --- diff --git a/salt/modules/apk.py b/salt/modules/apk.py new file mode 100644 -index 0000000..c44b3a7 +index 0000000..4c0efe0 --- /dev/null +++ b/salt/modules/apk.py @@ -0,0 +1,619 @@ @@ -210,7 +210,7 @@ index 0000000..c44b3a7 + newversion = line.split(' ')[5].strip(')') + if name in names: + ret[name] = newversion -+ except ValueError: ++ except (ValueError, IndexError): + pass + + # If version is empty, package may not be installed diff --git a/community/salt/APKBUILD b/community/salt/APKBUILD index 241de14dfd..f4b720cd9d 100644 --- a/community/salt/APKBUILD +++ b/community/salt/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: Olivier Mauras pkgname=salt pkgver=2016.3.3 -pkgrel=8 +pkgrel=9 pkgdesc="A parallel remote execution system" url="https://github.com/saltstack/salt" arch="noarch" @@ -119,7 +119,7 @@ md5sums="5db25ad762a0780ff5d74561516a97fa salt-2016.3.3.tar.gz c8326b9cff0df6065a1320eefea09b2c salt-minion.initd a24d13b018a35b31b34167bcaa749db5 salt-syndic.confd dffce15d3a16a2dc40dd02d0c24fb4c6 salt-syndic.initd -1d43b44ec1b1232a1d438f9339ec4da6 0001-alpine-support.patch" +49349ad8522a07226ed1aaeaab15c695 0001-alpine-support.patch" sha256sums="7d09bc9142d96ecdfe779cf813e43ab62b9b4632f6e0711af383809661b87e1d salt-2016.3.3.tar.gz b25cfdb769305f2245b27f6753adee590bac10faeb8c43ba605dbf7e931fe258 salt-api.confd f8918f2819b81e69af1b8564b90ec370942ed733aefd4b97e5d2446a892880eb salt-api.initd @@ -129,7 +129,7 @@ f8918f2819b81e69af1b8564b90ec370942ed733aefd4b97e5d2446a892880eb salt-api.initd ae9236919c3fee3eef0ef8ad54334d6f833a51bbd4d42c40214614498acbe573 salt-minion.initd 66a663c426e2fa157ea78f7f9b2f33f17b72dbc48e119f8dd2609aab8f8370e7 salt-syndic.confd 6a453f63e51f2cc1ecb024ee8e7fa1beab7fbcea010f3eb10ea23bdb2383e7f5 salt-syndic.initd -bac79a91a4d24bf28687ab7bee42bce47d315a59441afde6a298d7fd00ad71ea 0001-alpine-support.patch" +d1a4868c389fa95b3fb97e39eaead450857ce1f779f2288666838ca97956bfe3 0001-alpine-support.patch" sha512sums="89a6f9e7d8a337ec5addda2374c833d251162150c4e57ce34f7f9e81a75f540539071064c0e7c4486ef6e447c6422363f868e9b035e4c5af2f3d320e98e0226d salt-2016.3.3.tar.gz 975ba2f5e681fbd62045da61cc3dc065b148683a07b5df7eca9f131e47314eb6bfa8660ca1c06a3bd93683c7097d0ff9f8e514273dd24d82fb2de6a255e6b275 salt-api.confd 435d399bfecf431d0c713031e2ae57ce25b5c6edc98b62f33bd7a4ff1c587e3cdeb988445ae0c3e9ffc1911555c3694654d98815f9562b8a14bf0688ec1ebea6 salt-api.initd @@ -139,4 +139,4 @@ cfbbeb8023a383e7c42d84e3346edfd068c9ec7650c4ddc3caa38534da325a67497e1f06ca02cc1f c6634a592c6f3e65dd2b704cb500486bf8004c5b287d4a4d42b09af36ef129c59d6a89f005af058cf7911e8587d927b3db931186569084f13ebaca56f6ef93a0 salt-minion.initd bafc6ea10cdafd0aef868feb35aecbe4ae6a7dff0ae42862bded85715ad763eb89e1ed27437866a7e5f2b9f7064e3c2a3fb59814487744ba4227238d95cf3818 salt-syndic.confd d71133e834685304e0167554035ebbc861252f972bbe981cc71e45b70f15d94a28a02a369463c9a641372919689f96b62a0408b14f824ad986d536e52b1e5ec0 salt-syndic.initd -ae96326d2dbe7f7339e81cb70bb720137c3c041d404078d33ae421b5fa841faea2010142607fc56f7895c0a3acc98c0c343006c1b70236fdc9d97c745552b672 0001-alpine-support.patch" +ebb30fd9e63c87d6acbaab588f474b1c3ee503be4535a868af041435eab334d7ad841814a4a4b385cb2c5ae0d10b597d1de7073af05606dee846d864973553e5 0001-alpine-support.patch" -- cgit v1.2.3