diff options
| author | Olivier Mauras <olivier@mauras.ch> | 2016-10-06 01:05:32 +0200 |
|---|---|---|
| committer | Jakub Jirutka <jakub@jirutka.cz> | 2016-10-06 02:23:24 +0200 |
| commit | 2b02e7a43bb060e7b677938a42271dc05e7dbcdb (patch) | |
| tree | 60e6a0ebd1fd725e5c81489a1a95d722475585d4 /community/salt | |
| parent | 0caaefee739ef2d2cc3cc7d62f2513171c69892b (diff) | |
| download | aports-2b02e7a43bb060e7b677938a42271dc05e7dbcdb.tar.bz2 aports-2b02e7a43bb060e7b677938a42271dc05e7dbcdb.tar.xz | |
community/salt: prevent errors in pkg.list_upgrades
Diffstat (limited to 'community/salt')
| -rw-r--r-- | community/salt/0001-alpine-support.patch | 4 | ||||
| -rw-r--r-- | community/salt/APKBUILD | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/community/salt/0001-alpine-support.patch b/community/salt/0001-alpine-support.patch index accfdb7daa..9d84f15fd7 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..8dae7a8 +index 0000000..c44b3a7 --- /dev/null +++ b/salt/modules/apk.py @@ -0,0 +1,613 @@ @@ -519,7 +519,7 @@ index 0000000..8dae7a8 + out = call['stdout'] + + for line in out.splitlines(): -+ if not line.startswith('OK:'): ++ if 'Upgrading' in line: + name = line.split(' ')[2] + _oldversion = line.split(' ')[3].strip('(') + newversion = line.split(' ')[5].strip(')') diff --git a/community/salt/APKBUILD b/community/salt/APKBUILD index 450024c2e3..0810fac7fb 100644 --- a/community/salt/APKBUILD +++ b/community/salt/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: Olivier Mauras <olivier@mauras.ch> pkgname=salt pkgver=2016.3.3 -pkgrel=6 +pkgrel=7 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 -f0753cc478ed702e2dd0e29f299a3b0f 0001-alpine-support.patch" +f4e5d5cb2911412c3c693696476f97e8 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 -9eff33fba425144920cfe0da745729520cf29e459fd24aa675dc6258782b459d 0001-alpine-support.patch" +305bfa13bb1fc9cd5f8265bc83e4e932e08b3b73446d9f1d8bfc26975f59b072 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 -ed06320e4e8d78048f52730081e140dee9cae3cb60d823d6cc8910ed939be80a253d19e863b0b98cab138b21e26f8475ee2206af73f5a50c61d176b5b23ab9ff 0001-alpine-support.patch" +26ef4e5d974bc6f2e4fe8ac43b6b7a6b03ade84fa1326c6cf4e6b1f9354a66d8e01e5ff455c9809eb637861b4545d3297f55adf07409e786452a94fedbb94bfd 0001-alpine-support.patch" |