From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RcjXA-0002Zj-Aa for garchives@archives.gentoo.org; Mon, 19 Dec 2011 20:10:04 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0061121C20B; Mon, 19 Dec 2011 20:09:50 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id C83AF21C20B for ; Mon, 19 Dec 2011 20:09:50 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3479E1B4003 for ; Mon, 19 Dec 2011 20:09:50 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 559) id F3A402004B; Mon, 19 Dec 2011 20:09:48 +0000 (UTC) From: "Mike Frysinger (vapier)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, vapier@gentoo.org Subject: [gentoo-commits] gentoo-projects commit in portage-utils: main.c X-VCS-Repository: gentoo-projects X-VCS-Files: main.c X-VCS-Directories: portage-utils X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger Content-Type: text/plain; charset=utf8 Message-Id: <20111219200948.F3A402004B@flycatcher.gentoo.org> Date: Mon, 19 Dec 2011 20:09:48 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 080d2a86-d68b-4b4f-9aec-81c5dc3a8626 X-Archives-Hash: e6f87481aed9b1bcc29b2ee358d70730 vapier 11/12/19 20:09:48 Modified: main.c Log: dump variable values after we have expanded inline variables Revision Changes Path 1.209 portage-utils/main.c file : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils= /main.c?rev=3D1.209&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils= /main.c?rev=3D1.209&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils= /main.c?r1=3D1.208&r2=3D1.209 Index: main.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-projects/portage-utils/main.c,v retrieving revision 1.208 retrieving revision 1.209 diff -u -r1.208 -r1.209 --- main.c 19 Dec 2011 19:43:36 -0000 1.208 +++ main.c 19 Dec 2011 20:09:48 -0000 1.209 @@ -1,7 +1,7 @@ /* * Copyright 2005-2008 Gentoo Foundation * Distributed under the terms of the GNU General Public License v2 - * $Header: /var/cvsroot/gentoo-projects/portage-utils/main.c,v 1.208 20= 11/12/19 19:43:36 grobian Exp $ + * $Header: /var/cvsroot/gentoo-projects/portage-utils/main.c,v 1.209 20= 11/12/19 20:09:48 vapier Exp $ * * Copyright 2005-2008 Ned Ludd - * Copyright 2005-2008 Mike Frysinger - @@ -722,14 +722,6 @@ s =3D getenv(var->name); if (s !=3D NULL) set_portage_env_var(var, s); - if (getenv("DEBUG") IF_DEBUG(|| 1)) { - fprintf(stderr, "%s =3D ", var->name); - switch (var->type) { - case _Q_BOOL: fprintf(stderr, "%i\n", *var->value.b); break; - case _Q_STR: - case _Q_ISTR: fprintf(stderr, "%s\n", *var->value.s); break; - } - } } =20 /* expand any nested variables e.g. PORTDIR=3D${EPREFIX}/usr/portage */ @@ -796,6 +788,18 @@ } } =20 + if (getenv("DEBUG") IF_DEBUG(|| 1)) { + for (i =3D 0; vars_to_read[i].name; ++i) { + var =3D &vars_to_read[i]; + fprintf(stderr, "%s =3D ", var->name); + switch (var->type) { + case _Q_BOOL: fprintf(stderr, "%i\n", *var->value.b); break; + case _Q_STR: + case _Q_ISTR: fprintf(stderr, "%s\n", *var->value.s); break; + } + } + } + /* Make sure ROOT always ends in a slash */ var =3D &vars_to_read[0]; if ((*var->value.s)[var->value_len - 1] !=3D '/') {