Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
aports
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Maxim Karasev
aports
Commits
b54c4fcb
Commit
b54c4fcb
authored
8 years ago
by
Steeve Chailloux
Committed by
Jakub Jirutka
8 years ago
Browse files
Options
Downloads
Patches
Plain Diff
community/salt: update alpine-support
see:
https://github.com/saltstack/salt/pull/36904
parent
620f864c
Loading
Loading
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
community/salt/0001-alpine-support.patch
+7
-1
7 additions, 1 deletion
community/salt/0001-alpine-support.patch
community/salt/APKBUILD
+4
-4
4 additions, 4 deletions
community/salt/APKBUILD
with
11 additions
and
5 deletions
community/salt/0001-alpine-support.patch
+
7
−
1
View file @
b54c4fcb
...
...
@@ -5,7 +5,7 @@ new file mode 100644
index 0000000..c44b3a7
--- /dev/null
+++ b/salt/modules/apk.py
@@ -0,0 +1,61
3
@@
@@ -0,0 +1,61
9
@@
+# -*- coding: utf-8 -*-
+'''
+Support for apk
...
...
@@ -309,6 +309,12 @@ index 0000000..c44b3a7
+ pkg_to_install = [name]
+
+ if pkgs:
+ # We don't support installing specific version for now
+ # so transform the dict in list ignoring version provided
+ pkgs = [
+ p.keys()[0] for p in pkgs
+ if isinstance(p, dict)
+ ]
+ pkg_to_install.extend(pkgs)
+
+ if not pkg_to_install:
...
...
This diff is collapsed.
Click to expand it.
community/salt/APKBUILD
+
4
−
4
View file @
b54c4fcb
...
...
@@ -3,7 +3,7 @@
# Maintainer: Olivier Mauras <olivier@mauras.ch>
pkgname
=
salt
pkgver
=
2016.3.3
pkgrel
=
7
pkgrel
=
8
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
f4e5d5cb2911412c3c693696476f97e8
0001-alpine-support.patch"
1d43b44ec1b1232a1d438f9339ec4da6
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
305bfa13bb1fc9cd5f8265bc83e4e932e08b3b73446d9f1d8bfc26975f59b072
0001-alpine-support.patch"
bac79a91a4d24bf28687ab7bee42bce47d315a59441afde6a298d7fd00ad71ea
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
26ef4e5d974bc6f2e4fe8ac43b6b7a6b03ade84fa1326c6cf4e6b1f9354a66d8e01e5ff455c9809eb637861b4545d3297f55adf07409e786452a94fedbb94bfd
0001-alpine-support.patch"
ae96326d2dbe7f7339e81cb70bb720137c3c041d404078d33ae421b5fa841faea2010142607fc56f7895c0a3acc98c0c343006c1b70236fdc9d97c745552b672
0001-alpine-support.patch"
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment