public inbox for gentoo-python@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Michał Górny" <mgorny@gentoo.org>
To: "Michał Górny" <mgorny@gentoo.org>
Cc: gentoo-python@lists.gentoo.org, python@gentoo.org
Subject: Re: [gentoo-python] [PATCH 2/2] Support python-exec:2.
Date: Sun, 15 Sep 2013 11:29:06 +0200	[thread overview]
Message-ID: <20130915112906.4c639f6c@gentoo.org> (raw)
In-Reply-To: <1379235806-15800-3-git-send-email-mgorny@gentoo.org>

[-- Attachment #1: Type: text/plain, Size: 1047 bytes --]

Minor fix:

Dnia 2013-09-15, o godz. 11:03:26
Michał Górny <mgorny@gentoo.org> napisał(a):

> @@ -756,20 +756,30 @@ python_newscript() {
>  	[[ ${#} -eq 2 ]] || die "Usage: ${FUNCNAME} <path> <new-name>"
>  
>  	local d=${python_scriptroot:-${DESTTREE}/bin}
> +	local wrapd=${d}
>  
>  	local f=${1}
>  	local barefn=${2}
> +	local newfn
>  
> -	local newfn=${barefn}-${EPYTHON}
> +	if _python_want_python_exec2; then
> +		local PYTHON_SCRIPTDIR
> +		python_export PYTHON_SCRIPTDIR
> +		d=${PYTHON_SCRIPTDIR#${EPREFIX}}
> +		newfn=${barefn}
> +	else
> +		newfn=${barefn}-${EPYTHON}
> +	fi
>  
>  	(
> +		dodir "${wrapd}"
>  		exeinto "${d}"
>  		newexe "${f}" "${newfn}" || die
>  	)
>  	_python_rewrite_shebang "${ED%/}/${d}/${newfn}"
>  
>  	# install the wrapper
> -	_python_ln_rel "${ED%/}"/usr/bin/python-exec \
> +	_python_ln_rel "${ED%/}"$(_python_get_wrapper_path) \
>  		"${ED%/}/${d}/${barefn}" || die
                         ^^^^ ${wrapd} needs to go here.

-- 
Best regards,
Michał Górny

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 966 bytes --]

      reply	other threads:[~2013-09-15  9:28 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-09-13 18:58 [gentoo-python] Clean up of python eclasses and support for python-exec:2 Michał Górny
2013-09-13 18:58 ` [gentoo-python] [PATCH 1/8] Add PYTHON_SCRIPTDIR for script installation path Michał Górny
2013-09-13 18:58 ` [gentoo-python] [PATCH 2/8] Clean up python_replicate_script() Michał Górny
2013-09-15 17:11   ` [gentoo-python] " Mike Gilbert
2013-09-15 17:36     ` Michał Górny
2013-09-13 18:58 ` [gentoo-python] [PATCH 3/8] Clean up python_newscript() Michał Górny
2013-09-13 18:58 ` [gentoo-python] [PATCH 4/8] distutils-r1: rework script install/wrapping Michał Górny
2013-09-13 18:58 ` [gentoo-python] [PATCH 5/8] distutils-r1: disable sub-root merging Michał Górny
2013-09-14 22:16   ` [gentoo-python] " Mike Gilbert
2013-09-14 22:38     ` Michał Górny
2013-09-14 23:33       ` Mike Gilbert
2013-09-15  9:04         ` Michał Górny
2013-09-13 18:58 ` [gentoo-python] [PATCH 6/8] _distutils-r1_wrap_scripts(): do not pass root path explicitly Michał Górny
2013-09-13 18:58 ` [gentoo-python] [PATCH 7/8] Replace _python_ln_rel() with _python_symlink_wrapper() Michał Górny
2013-09-15 17:27   ` [gentoo-python] " Mike Gilbert
2013-09-13 18:58 ` [gentoo-python] [PATCH 8/8] Support python-exec:2 Michał Górny
2013-09-15  9:03 ` [gentoo-python] Clean up of python eclasses and support for python-exec:2, r2 Michał Górny
2013-09-15  9:03   ` [gentoo-python] [PATCH 1/2] distutils-r1: clean up script install/wrapping Michał Górny
2013-09-15  9:03   ` [gentoo-python] [PATCH 2/2] Support python-exec:2 Michał Górny
2013-09-15  9:29     ` Michał Górny [this message]

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=20130915112906.4c639f6c@gentoo.org \
    --to=mgorny@gentoo.org \
    --cc=gentoo-python@lists.gentoo.org \
    --cc=python@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