From 4b6f69e4de84dd6befb7ccad1646520446924854 Mon Sep 17 00:00:00 2001 From: Elias Probst Date: Thu, 5 Nov 2015 09:54:35 +0100 Subject: 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 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() { -- cgit v1.2.3-65-gdbad