summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-08-06 22:21:16 +0000
committerZac Medico <zmedico@gentoo.org>2009-08-06 22:21:16 +0000
commit8f6e626429e6e94d40b624eaca9a423cf3e4b7e3 (patch)
treed0e84cdf2b30b567edef4b3b5d066a5f54b6e00e
parentremove mask entry for net-misc/tor release candidates, final 0.2.1 version no... (diff)
downloadgentoo-2-8f6e626429e6e94d40b624eaca9a423cf3e4b7e3.tar.gz
gentoo-2-8f6e626429e6e94d40b624eaca9a423cf3e4b7e3.tar.bz2
gentoo-2-8f6e626429e6e94d40b624eaca9a423cf3e4b7e3.zip
Fix portage.settings.packages code for compatibility with unicode strings.
-rwxr-xr-xscripts/bootstrap.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
index ceca934b0875..29d264158f04 100755
--- a/scripts/bootstrap.sh
+++ b/scripts/bootstrap.sh
@@ -1,7 +1,7 @@
#!/bin/bash
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/scripts/bootstrap.sh,v 1.87 2008/03/30 16:51:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/scripts/bootstrap.sh,v 1.88 2009/08/06 22:21:16 zmedico Exp $
# people who were here:
# (drobbins, 06 Jun 2003)
@@ -52,7 +52,7 @@ v_echo() {
env "$@"
}
-cvsver="$Header: /var/cvsroot/gentoo-x86/scripts/bootstrap.sh,v 1.87 2008/03/30 16:51:39 vapier Exp $"
+cvsver="$Header: /var/cvsroot/gentoo-x86/scripts/bootstrap.sh,v 1.88 2009/08/06 22:21:16 zmedico Exp $"
cvsver=${cvsver##*,v }
cvsver=${cvsver%%Exp*}
cvsyear=${cvsver#* }
@@ -254,7 +254,7 @@ done
# parents. So we now call portage to read the aggregate profile and store
# that into a variable.
-eval $(pycmd 'import portage; print portage.settings.packages;' |
+eval $(pycmd 'import portage; print [str(x) for x in portage.settings.packages];' |
sed 's/[][,]//g; s/\*//g' | tr ' ' '\n' | while read p; do n=${p##*/}; n=${n%\'};
n=${n%%-[0-9]*}; echo "my$(tr a-z- A-Z_ <<<$n)=$p; "; done)