From: "Mike Frysinger (vapier)" <vapier@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] gentoo-projects commit in portage-utils: main.c
Date: Tue, 7 Dec 2010 01:13:04 +0000 (UTC) [thread overview]
Message-ID: <20101207011304.F421220054@flycatcher.gentoo.org> (raw)
vapier 10/12/07 01:13:04
Modified: main.c
Log:
also read /usr/share/portage/config/make.globals and /etc/portage/make.profile #346569
Revision Changes Path
1.178 portage-utils/main.c
file : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/main.c?rev=1.178&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/main.c?rev=1.178&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/main.c?r1=1.177&r2=1.178
Index: main.c
===================================================================
RCS file: /var/cvsroot/gentoo-projects/portage-utils/main.c,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -r1.177 -r1.178
--- main.c 4 Dec 2010 12:37:28 -0000 1.177
+++ main.c 7 Dec 2010 01:13:04 -0000 1.178
@@ -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.177 2010/12/04 12:37:28 vapier Exp $
+ * $Header: /var/cvsroot/gentoo-projects/portage-utils/main.c,v 1.178 2010/12/07 01:13:04 vapier Exp $
*
* Copyright 2005-2008 Ned Ludd - <solar@gentoo.org>
* Copyright 2005-2008 Mike Frysinger - <vapier@gentoo.org>
@@ -592,6 +592,7 @@
static const char * const files[] = {
EPREFIX "/etc/make.globals",
+ EPREFIX "/usr/share/portage/config/make.globals",
EPREFIX "/etc/make.conf",
EPREFIX "/etc/portage/make.conf",
};
@@ -627,6 +628,7 @@
/* walk all the stacked profiles */
read_portage_profile(EPREFIX "/etc/make.profile", vars_to_read);
+ read_portage_profile(EPREFIX "/etc/portage/make.profile", vars_to_read);
/* now read all the config files */
for (i = 0; i < ARR_SIZE(files); ++i)
next reply other threads:[~2010-12-07 1:13 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-07 1:13 Mike Frysinger (vapier) [this message]
-- strict thread matches above, loose matches on Subject: below --
2013-10-31 2:40 [gentoo-commits] gentoo-projects commit in portage-utils: main.c Mike Frysinger (vapier)
2013-05-23 3:19 Mike Frysinger (vapier)
2013-04-03 18:39 Mike Frysinger (vapier)
2012-10-28 10:29 Mike Frysinger (vapier)
2012-10-28 10:11 Mike Frysinger (vapier)
2012-08-13 21:16 Robin H. Johnson (robbat2)
2012-08-04 20:24 Mike Frysinger (vapier)
2012-06-04 23:13 Mike Frysinger (vapier)
2012-05-19 13:20 Mike Frysinger (vapier)
2012-01-08 17:41 Ned Ludd (solar)
2011-12-22 20:26 Mike Frysinger (vapier)
2011-12-22 17:49 Mike Frysinger (vapier)
2011-12-22 17:11 Mike Frysinger (vapier)
2011-12-21 4:35 Mike Frysinger (vapier)
2011-12-19 20:09 Mike Frysinger (vapier)
2011-12-19 4:39 Mike Frysinger (vapier)
2011-12-19 4:37 Mike Frysinger (vapier)
2011-12-18 20:35 Mike Frysinger (vapier)
2011-12-18 20:21 Mike Frysinger (vapier)
2011-12-18 3:04 Mike Frysinger (vapier)
2011-12-12 21:42 Fabian Groffen (grobian)
2011-12-09 16:50 Mike Frysinger (vapier)
2011-10-02 22:08 Mike Frysinger (vapier)
2011-03-17 3:04 Mike Frysinger (vapier)
2011-03-02 8:10 Mike Frysinger (vapier)
2011-03-02 7:55 Mike Frysinger (vapier)
2011-03-02 5:31 Mike Frysinger (vapier)
2011-03-02 2:40 Mike Frysinger (vapier)
2011-02-28 18:16 Mike Frysinger (vapier)
2010-12-19 13:15 Fabian Groffen (grobian)
2010-12-04 12:37 Mike Frysinger (vapier)
2010-12-04 12:20 Mike Frysinger (vapier)
2010-12-04 11:15 Mike Frysinger (vapier)
2010-06-08 4:54 Mike Frysinger (vapier)
2010-01-17 0:25 Mike Frysinger (vapier)
2010-01-17 0:24 Mike Frysinger (vapier)
2010-01-13 18:23 Mike Frysinger (vapier)
2010-01-13 6:12 Ned Ludd (solar)
2009-09-08 16:49 Fabian Groffen (grobian)
2009-08-23 6:07 Ned Ludd (solar)
2009-03-15 10:03 Mike Frysinger (vapier)
2008-12-07 3:43 Ned Ludd (solar)
2008-09-26 16:42 Ned Ludd (solar)
2008-09-13 18:58 Fabian Groffen (grobian)
2008-05-11 17:25 Ned Ludd (solar)
2008-01-16 7:09 Mike Frysinger (vapier)
2008-01-15 8:03 Mike Frysinger (vapier)
2007-10-28 21:22 Ned Ludd (solar)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20101207011304.F421220054@flycatcher.gentoo.org \
--to=vapier@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox