Fixes 'too many arguments' error in check_portage_version.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@952 d1e1f19c-881f-0410-ab34-b69fee027534

diff --git a/ChangeLog b/ChangeLog
index 746b490b845f398f4f631206333d6fefc71fde1e..f94cf836f39689174b92af08c42749e6361393db 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.439 2005/12/08 22:23:31 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.440 2005/12/08 22:24:25 wolf31o2 Exp $
+
+  08 Dec 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  targets/support/chroot-functions.sh:
+  Fixes 'too many arguments' error in check_portage_version.
 
   08 Dec 2005; Eric Edgar <rocket@gentoo.org>
   modules/generic_stage_target.py:

diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
index 77d5a4bcd958a3af3ff5cd8cc106ba90b741d51a..a6931a57ed73ae95e46d6bb8d70ebba8baa4f8f7 100755 (executable)
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -14,9 +14,10 @@ trap "echo SIGKILL signal recieved killing $0 with pid $$;kill -9 $$" SIGKILL
 trap "echo SIGINT signal recieved killing $0 with pid $$;kill -9 $$" SIGINT
  
 check_portage_version(){
-       portage_version=`/usr/lib/portage/bin/portageq best_version / sys-apps/portage \
-               | cut -d/ -f2 | cut -d- -f2,3`
-       if [ -n ${portage_version} -a `echo ${portage_version} | cut -d- -f1 | cut -d. -f3` -lt '51' ]
+       portage_version=`/usr/lib/portage/bin/portageq best_version / \
+               sys-apps/portage | cut -d/ -f2 | cut -d- -f2,3`
+       if [ -n "${portage_version}" -a `echo ${portage_version} | cut -d- -f1 \
+               | cut -d. -f3` -lt '51' ]
        then
                echo "ERROR: Your portage version is too low in your seed stage.  Portage version"
                echo "2.0.51 or greater is required."