[gentoo-commits] repo/gentoo:master commit in: app-admin/salt/

[Justin Lecher]

commit:     4b6f69e4de84dd6befb7ccad1646520446924854
Author:     Elias Probst <mail <AT> eliasprobst <DOT> eu>
AuthorDate: Thu Nov  5 08:54:35 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Nov  6 07:29:30 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b6f69e4

app-admin/salt: Add missing 'die' statements in python_prepare()

Package-Manager: portage-2.2.23

 app-admin/salt/salt-2015.5.3.ebuild | 3 ++-
 app-admin/salt/salt-2015.5.5.ebuild | 3 ++-
 app-admin/salt/salt-2015.5.6.ebuild | 3 ++-
 app-admin/salt/salt-2015.8.0.ebuild | 3 ++-
 app-admin/salt/salt-9999.ebuild     | 3 ++-
 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 37c2172..5fedb9d 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 2ab01a5..b93c09d 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 e673bfe..875bbaa 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 aaf7c84..2787868 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 d7d1937..9c8d42f 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() {