[gentoo-commits] gentoo-x86 commit in scripts: bootstrap.sh

["Zac Medico (zmedico)" <zmedico@gentoo.org>]

zmedico     09/08/06 22:21:16

  Modified:             bootstrap.sh
  Log:
  Fix portage.settings.packages code for compatibility with unicode strings.

Revision  Changes    Path
1.88                 scripts/bootstrap.sh

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/scripts/bootstrap.sh?rev=1.88&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/scripts/bootstrap.sh?rev=1.88&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/scripts/bootstrap.sh?r1=1.87&r2=1.88

Index: bootstrap.sh
===================================================================
RCS file: /var/cvsroot/gentoo-x86/scripts/bootstrap.sh,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- bootstrap.sh	30 Mar 2008 16:51:39 -0000	1.87
+++ bootstrap.sh	6 Aug 2009 22:21:16 -0000	1.88
@@ -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 @@
 	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 @@
 # 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)