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

Package-Manager: portage-2.2.23

diff --git a/app-admin/salt/salt-2015.5.3.ebuild b/app-admin/salt/salt-2015.5.3.ebuild
index 37c21728f3006d1d9deba35e46c14e8f76b63772..5fedb9d62c2f2926e721bb1541f28e1797f72eee 100644 (file)
--- 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 2ab01a5ce8b255c1eed29c77b005682d26aba1ff..b93c09d95ca25afb54ebdfa455382e40bfc774da 100644 (file)
--- 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 e673bfe5d5e492f70c25bf429e8e084724fd5b30..875bbaa53d70b31ba0696544bcbc9a7665958250 100644 (file)
--- 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 aaf7c84a1f5c9021cf0c97be458e4709d54f2d89..2787868811f2c293c87a2340de6984f6a76c1d1a 100644 (file)
--- 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 d7d1937a474c95b73e3ac7991525083ddbe2c551..9c8d42ff8405f5a0e0d9344aa2064a6bfbeb3f25 100644 (file)
--- 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() {