summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElias Probst <mail@eliasprobst.eu>2015-11-05 09:54:35 +0100
committerJustin Lecher <jlec@gentoo.org>2015-11-06 08:29:30 +0100
commit4b6f69e4de84dd6befb7ccad1646520446924854 (patch)
treebb8db47e88a95b4edef3a30c5f6e342f3e7eef25 /app-admin/salt
parentapp-admin/salt: Bumps to fix bug#563508 and CVE-2015-6941 (diff)
downloadgentoo-4b6f69e4de84dd6befb7ccad1646520446924854.tar.gz
gentoo-4b6f69e4de84dd6befb7ccad1646520446924854.tar.bz2
gentoo-4b6f69e4de84dd6befb7ccad1646520446924854.zip
app-admin/salt: Add missing 'die' statements in python_prepare()
Package-Manager: portage-2.2.23
Diffstat (limited to 'app-admin/salt')
-rw-r--r--app-admin/salt/salt-2015.5.3.ebuild3
-rw-r--r--app-admin/salt/salt-2015.5.5.ebuild3
-rw-r--r--app-admin/salt/salt-2015.5.6.ebuild3
-rw-r--r--app-admin/salt/salt-2015.8.0.ebuild3
-rw-r--r--app-admin/salt/salt-9999.ebuild3
5 files changed, 10 insertions, 5 deletions
diff --git a/app-admin/salt/salt-2015.5.3.ebuild b/app-admin/salt/salt-2015.5.3.ebuild
index 37c21728f300..5fedb9d62c2f 100644
--- a/app-admin/salt/salt-2015.5.3.ebuild
+++ b/app-admin/salt/salt-2015.5.3.ebuild
@@ -85,7 +85,8 @@ PATCHES=(
python_prepare() {
# this test fails because it trys to "pip install distribute"
- rm tests/unit/{modules,states}/zcbuildout_test.py tests/unit/modules/{rh_ip,win_network}_test.py
+ rm tests/unit/{modules,states}/zcbuildout_test.py tests/unit/modules/{rh_ip,win_network}_test.py \
+ || die "Failed to remove broken tests"
}
python_install_all() {
diff --git a/app-admin/salt/salt-2015.5.5.ebuild b/app-admin/salt/salt-2015.5.5.ebuild
index 2ab01a5ce8b2..b93c09d95ca2 100644
--- a/app-admin/salt/salt-2015.5.5.ebuild
+++ b/app-admin/salt/salt-2015.5.5.ebuild
@@ -88,7 +88,8 @@ PATCHES=(
python_prepare() {
# this test fails because it trys to "pip install distribute"
- rm tests/unit/{modules,states}/zcbuildout_test.py tests/unit/modules/{rh_ip,win_network}_test.py
+ rm tests/unit/{modules,states}/zcbuildout_test.py tests/unit/modules/{rh_ip,win_network}_test.py \
+ || die "Failed to remove broken tests"
}
python_install_all() {
diff --git a/app-admin/salt/salt-2015.5.6.ebuild b/app-admin/salt/salt-2015.5.6.ebuild
index e673bfe5d5e4..875bbaa53d70 100644
--- a/app-admin/salt/salt-2015.5.6.ebuild
+++ b/app-admin/salt/salt-2015.5.6.ebuild
@@ -87,7 +87,8 @@ PATCHES=(
python_prepare() {
# this test fails because it trys to "pip install distribute"
- rm tests/unit/{modules,states}/zcbuildout_test.py tests/unit/modules/{rh_ip,win_network}_test.py
+ rm tests/unit/{modules,states}/zcbuildout_test.py tests/unit/modules/{rh_ip,win_network}_test.py \
+ || die "Failed to remove broken tests"
}
python_install_all() {
diff --git a/app-admin/salt/salt-2015.8.0.ebuild b/app-admin/salt/salt-2015.8.0.ebuild
index aaf7c84a1f5c..2787868811f2 100644
--- a/app-admin/salt/salt-2015.8.0.ebuild
+++ b/app-admin/salt/salt-2015.8.0.ebuild
@@ -90,7 +90,8 @@ PATCHES=(
python_prepare() {
# this test fails because it trys to "pip install distribute"
rm tests/unit/{modules,states}/zcbuildout_test.py \
- tests/unit/modules/{rh_ip,win_network,random_org}_test.py
+ tests/unit/modules/{rh_ip,win_network,random_org}_test.py \
+ || die "Failed to remove broken tests"
}
python_install_all() {
diff --git a/app-admin/salt/salt-9999.ebuild b/app-admin/salt/salt-9999.ebuild
index d7d1937a474c..9c8d42ff8405 100644
--- a/app-admin/salt/salt-9999.ebuild
+++ b/app-admin/salt/salt-9999.ebuild
@@ -77,7 +77,8 @@ REQUIRED_USE="|| ( raet zeromq )"
python_prepare() {
# this test fails because it trys to "pip install distribute"
- rm tests/unit/{modules,states}/zcbuildout_test.py
+ rm tests/unit/{modules,states}/zcbuildout_test.py \
+ || die "Failed to remove broken tests"
}
python_install_all() {