public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Mike Gilbert" <floppym@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/backports-ssl-match-hostname/
Date: Fri, 22 Jan 2016 17:42:02 +0000 (UTC)	[thread overview]
Message-ID: <1453484518.9cb36112ae4e50d81844f62d8c043cc75963f7e4.floppym@gentoo> (raw)

commit:     9cb36112ae4e50d81844f62d8c043cc75963f7e4
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 22 17:41:48 2016 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Fri Jan 22 17:41:58 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9cb36112

dev-python/backports-ssl-match-hostname: Fix file collison

Bug: https://bugs.gentoo.org/572610

Package-Manager: portage-2.2.27_p47

 ....0.1.ebuild => backports-ssl-match-hostname-3.5.0.1-r1.ebuild} | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev-python/backports-ssl-match-hostname/backports-ssl-match-hostname-3.5.0.1.ebuild b/dev-python/backports-ssl-match-hostname/backports-ssl-match-hostname-3.5.0.1-r1.ebuild
similarity index 86%
rename from dev-python/backports-ssl-match-hostname/backports-ssl-match-hostname-3.5.0.1.ebuild
rename to dev-python/backports-ssl-match-hostname/backports-ssl-match-hostname-3.5.0.1-r1.ebuild
index 14196a4..89628b3 100644
--- a/dev-python/backports-ssl-match-hostname/backports-ssl-match-hostname-3.5.0.1.ebuild
+++ b/dev-python/backports-ssl-match-hostname/backports-ssl-match-hostname-3.5.0.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -30,8 +30,8 @@ python_install_all() {
 }
 
 python_install() {
-	distutils-r1_python_install
-
 	# main namespace provided by dev-python/backports
-	rm "${ED}$(python_get_sitedir)"/backports/__init__.py* || die
+	rm "${BUILD_DIR}"/lib/backports/__init__.py || die
+	rm -f backports/__init__.py || die
+	distutils-r1_python_install
 }


             reply	other threads:[~2016-01-22 17:42 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-01-22 17:42 Mike Gilbert [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-08-21 17:15 [gentoo-commits] repo/gentoo:master commit in: dev-python/backports-ssl-match-hostname/ Patrick McLean
2019-03-16 18:53 Mikle Kolyada
2018-06-28  6:50 Fabian Groffen
2018-02-21 22:11 Michał Górny
2017-09-25 13:43 Manuel Rüger
2017-09-25 13:37 Pacho Ramos
2017-07-16 12:32 Patrice Clement
2017-06-10 17:13 Mike Gilbert
2017-05-02 14:02 Michał Górny
2017-02-28 22:49 Michael Weber
2016-12-01 20:50 Markus Meier
2016-11-20 13:45 Agostino Sarubbo
2016-11-14 15:09 Tobias Klausmann
2016-11-12 11:11 Jeroen Roovers
2016-11-07 15:37 Agostino Sarubbo
2016-04-20 10:55 Anthony G. Basile
2016-03-27 19:04 David Seifert
2016-02-28  6:51 Matt Thode
2016-01-11  9:56 Agostino Sarubbo
2016-01-07 18:43 Patrick Lauer
2015-12-22 21:15 Manuel Rüger
2015-11-18 15:40 Justin Lecher
2015-08-20 17:12 Tobias Klausmann

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1453484518.9cb36112ae4e50d81844f62d8c043cc75963f7e4.floppym@gentoo \
    --to=floppym@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox