Gentoo Archives: gentoo-commits

From: "Paul Varner (fuzzyray)" <fuzzyray@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoolkit r477 - in trunk: . src/gentoolkit
Date: Thu, 28 Feb 2008 23:43:49
Message-Id: E1JUsPh-0007xX-VP@stork.gentoo.org
1 Author: fuzzyray
2 Date: 2008-02-28 23:43:45 +0000 (Thu, 28 Feb 2008)
3 New Revision: 477
4
5 Modified:
6 trunk/ChangeLog
7 trunk/src/gentoolkit/__init__.py
8 Log:
9 Fix traceback when accessing the portage db. (Bug #211716)
10
11 Modified: trunk/ChangeLog
12 ===================================================================
13 --- trunk/ChangeLog 2008-02-28 15:21:24 UTC (rev 476)
14 +++ trunk/ChangeLog 2008-02-28 23:43:45 UTC (rev 477)
15 @@ -1,3 +1,7 @@
16 +2008-02-28: Paul Varner <fuzzyray@g.o>
17 + * gentoolkit: Fix traceback when accessing the portage
18 + db. (Bug #211716)
19 +
20 2008-02-21: Paul Varner <fuzzyray@g.o>
21 * revdep-rebuild: "Use /etc/init.d/functions.sh instead of
22 /sbin/functions.sh. (Bug 210940)
23
24 Modified: trunk/src/gentoolkit/__init__.py
25 ===================================================================
26 --- trunk/src/gentoolkit/__init__.py 2008-02-28 15:21:24 UTC (rev 476)
27 +++ trunk/src/gentoolkit/__init__.py 2008-02-28 23:43:45 UTC (rev 477)
28 @@ -27,12 +27,21 @@
29 import re
30 from threading import Lock
31
32 -settingslock = Lock()
33 -settings = portage.config(clone=portage.settings)
34 -porttree = portage.db[portage.root]["porttree"]
35 -vartree = portage.db[portage.root]["vartree"]
36 -virtuals = portage.db[portage.root]["virtuals"]
37 +try:
38 + import portage.exception as portage_exception
39 +except ImportError:
40 + import portage_exception
41
42 +try:
43 + settingslock = Lock()
44 + settings = portage.config(clone=portage.settings)
45 + porttree = portage.db[portage.root]["porttree"]
46 + vartree = portage.db[portage.root]["vartree"]
47 + virtuals = portage.db[portage.root]["virtuals"]
48 +except portage_exception.PermissionDenied, e:
49 + sys.stderr.write("Permission denied: '%s'\n" % str(e))
50 + sys.exit(e.errno)
51 +
52 Config = {
53 "verbosityLevel": 3
54 }
55
56 --
57 gentoo-commits@l.g.o mailing list