Gentoo Archives: gentoo-commits

From: "Fabian Groffen (grobian)" <grobian@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] portage r13866 - main/branches/prefix/pym/portage
Date: Fri, 31 Jul 2009 07:34:07
Message-Id: E1MWmcu-0002oz-Mm@stork.gentoo.org
1 Author: grobian
2 Date: 2009-07-31 07:34:04 +0000 (Fri, 31 Jul 2009)
3 New Revision: 13866
4
5 Modified:
6 main/branches/prefix/pym/portage/data.py
7 Log:
8 Try to fix bug #279550 (the backtrace that is), apparently we still use some old syntax. Disable the normal gentoo error message for now as two is a bit too much.
9
10 Modified: main/branches/prefix/pym/portage/data.py
11 ===================================================================
12 --- main/branches/prefix/pym/portage/data.py 2009-07-30 23:58:41 UTC (rev 13865)
13 +++ main/branches/prefix/pym/portage/data.py 2009-07-31 07:34:04 UTC (rev 13866)
14 @@ -86,21 +86,26 @@
15 portage_uid=0
16 portage_gid=0
17 writemsg("\n")
18 - writemsg( red("portage: "+portageuser+" user or "+portagegroup+" group missing.\n"))
19 - writemsg( red(" In Prefix Portage this is quite dramatic\n"))
20 - writemsg( red(" since it means you have thrown away yourself.\n"))
21 - writemsg( " Re-add yourself or re-bootstrap Gentoo Prefix.\n")
22 + writemsg(colorize("BAD",
23 + "portage: "+portageuser+" user or "+portagegroup+" group missing.") + "\n", noiselevel=-1)
24 + writemsg(colorize("BAD",
25 + " In Prefix Portage this is quite dramatic") + "\n", noiselevel=-1)
26 + writemsg(colorize("BAD",
27 + " since it means you have thrown away yourself.") + "\n", noiselevel=-1)
28 + writemsg(colorize("BAD",
29 + " Re-add yourself or re-bootstrap Gentoo Prefix.") + "\n", noiselevel=-1)
30 writemsg("\n")
31 - writemsg(colorize("BAD",
32 - "portage: 'portage' user or group missing.") + "\n", noiselevel=-1)
33 - writemsg(
34 - " For the defaults, line 1 goes into passwd, " + \
35 - "and 2 into group.\n", noiselevel=-1)
36 - writemsg(colorize("GOOD",
37 - " portage:x:250:250:portage:/var/tmp/portage:/bin/false") \
38 - + "\n", noiselevel=-1)
39 - writemsg(colorize("GOOD", " portage::250:portage") + "\n",
40 - noiselevel=-1)
41 +# we need to fix this one day to distinguish prefix vs non-prefix
42 +# writemsg(colorize("BAD",
43 +# "portage: 'portage' user or group missing.") + "\n", noiselevel=-1)
44 +# writemsg(
45 +# " For the defaults, line 1 goes into passwd, " + \
46 +# "and 2 into group.\n", noiselevel=-1)
47 +# writemsg(colorize("GOOD",
48 +# " portage:x:250:250:portage:/var/tmp/portage:/bin/false") \
49 +# + "\n", noiselevel=-1)
50 +# writemsg(colorize("GOOD", " portage::250:portage") + "\n",
51 +# noiselevel=-1)
52 portage_group_warning()
53
54 userpriv_groups = [portage_gid]