diff options
| author |   Jeremy Olexa <darkside@gentoo.org> | 2009-04-08 05:36:35 +0000 |
|---|---|---|
| committer | Jeremy Olexa <darkside@gentoo.org> | 2009-04-08 05:36:35 +0000 |
| commit | 0335813e52579d6a91d2e24858533546202ea9a5 (patch) | |
| tree | 0c3c21020b96a018345f320ec9942f1192212547 /app-admin | |
| parent | Version bump to fix bug 248470, patch by Thomas Bellman. Allows parent profil... (diff) | |
| download | gentoo-2-0335813e52579d6a91d2e24858533546202ea9a5.tar.gz gentoo-2-0335813e52579d6a91d2e24858533546202ea9a5.tar.bz2 gentoo-2-0335813e52579d6a91d2e24858533546202ea9a5.zip | |
Make 'eselect profile show' show the relative path. Patch by Thomas Bellman in bug 248487
(Portage version: 2.1.6.11/cvs/Linux x86_64)
Diffstat (limited to 'app-admin')
| -rw-r--r-- | app-admin/eselect/ChangeLog | 7 | ||||
| -rw-r--r-- | app-admin/eselect/eselect-1.0.11-r2.ebuild | 4 | ||||
| -rw-r--r-- | app-admin/eselect/files/eselect-1.0.11-relative-profiles.patch | 40 |
3 files changed, 48 insertions, 3 deletions
diff --git a/app-admin/eselect/ChangeLog b/app-admin/eselect/ChangeLog index 4199c9b40c4f..91292a2a9b87 100644 --- a/app-admin/eselect/ChangeLog +++ b/app-admin/eselect/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-admin/eselect # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect/ChangeLog,v 1.80 2009/04/08 05:23:54 darkside Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect/ChangeLog,v 1.81 2009/04/08 05:36:35 darkside Exp $ + + 08 Apr 2009; Jeremy Olexa <darkside@gentoo.org> + +files/eselect-1.0.11-relative-profiles.patch, eselect-1.0.11-r2.ebuild: + Make 'eselect profile show' show the relative path. Patch by Thomas Bellman + in bug 248487 *eselect-1.0.11-r2 (08 Apr 2009) diff --git a/app-admin/eselect/eselect-1.0.11-r2.ebuild b/app-admin/eselect/eselect-1.0.11-r2.ebuild index 328c938dede9..6241aef74188 100644 --- a/app-admin/eselect/eselect-1.0.11-r2.ebuild +++ b/app-admin/eselect/eselect-1.0.11-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect/eselect-1.0.11-r2.ebuild,v 1.1 2009/04/08 05:23:54 darkside Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect/eselect-1.0.11-r2.ebuild,v 1.2 2009/04/08 05:36:35 darkside Exp $ inherit eutils @@ -30,8 +30,8 @@ src_unpack() { cd "${S}" epatch "${FILESDIR}/${P}-fix-paludis-command.patch" - pwd epatch "${FILESDIR}/${P}-parent-profiles.patch" + epatch "${FILESDIR}/${P}-relative-profiles.patch" } src_compile() { diff --git a/app-admin/eselect/files/eselect-1.0.11-relative-profiles.patch b/app-admin/eselect/files/eselect-1.0.11-relative-profiles.patch new file mode 100644 index 000000000000..af788a5417a4 --- /dev/null +++ b/app-admin/eselect/files/eselect-1.0.11-relative-profiles.patch @@ -0,0 +1,40 @@ +Allow relative paths to be shown instead of abs paths for eselect profile show, + +patch by Thomas Bellman in bug 248487 + +Already in svn. + +--- modules/profile.eselect (revision 397) ++++ modules/profile.eselect (working copy) +@@ -83,9 +83,10 @@ + do_show() { + write_list_start "Current make.profile symlink:" + if [[ -L "${ROOT}/etc/make.profile" ]] ; then +- local link=$(canonicalise ${ROOT}/etc/make.profile) ++ local link=$(canonicalise "${ROOT}/etc/make.profile") + local portdir=$(portageq portdir) +- link=${link##..${ROOT}/${portdir}/profiles/} ++ local profiledir=$(canonicalise "${ROOT}/${portdir}/profiles") ++ link=${link##${profiledir}/} + write_kv_list_entry "${link}" "" + else + write_kv_list_entry "(unset)" "" +@@ -99,13 +100,15 @@ + } + + do_list() { +- local active targets ++ local portdir profiledir active targets + targets=( $(find_targets) ) + + [[ -z "${targets}" ]] && die -q "Failed to get a list of valid profiles" + +- active=$(canonicalise ${ROOT}/etc/make.profile) +- active=${active##*profiles/} ++ portdir=$(portageq portdir) ++ profiledir=$(canonicalise "${ROOT}/${portdir}/profiles") ++ active=$(canonicalise "${ROOT}/etc/make.profile") ++ active=${active##${profiledir}/} + if [[ -n ${targets[@]} ]] ; then + local i + for (( i = 0 ; i < ${#targets[@]} ; i = i + 1 )) ; do |