From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id ACE911384B4 for ; Fri, 6 Nov 2015 07:29:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D561821C010; Fri, 6 Nov 2015 07:29:39 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 55C2421C010 for ; Fri, 6 Nov 2015 07:29:39 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3B12D3405BB for ; Fri, 6 Nov 2015 07:29:38 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0BEC021BB for ; Fri, 6 Nov 2015 07:29:34 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <1446794970.4b6f69e4de84dd6befb7ccad1646520446924854.jlec@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/salt/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-admin/salt/salt-2015.5.3.ebuild app-admin/salt/salt-2015.5.5.ebuild app-admin/salt/salt-2015.5.6.ebuild app-admin/salt/salt-2015.8.0.ebuild app-admin/salt/salt-9999.ebuild X-VCS-Directories: app-admin/salt/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: 4b6f69e4de84dd6befb7ccad1646520446924854 X-VCS-Branch: master Date: Fri, 6 Nov 2015 07:29:34 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 679dea33-682e-410e-8d00-86c90304a6e3 X-Archives-Hash: 2a47bc2b8e5ea153c1ca05c092d4be91 commit: 4b6f69e4de84dd6befb7ccad1646520446924854 Author: Elias Probst eliasprobst eu> AuthorDate: Thu Nov 5 08:54:35 2015 +0000 Commit: Justin Lecher gentoo 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() {