| 1 |
Author: fuzzyray |
| 2 |
Date: 2010-01-08 21:38:33 +0000 (Fri, 08 Jan 2010) |
| 3 |
New Revision: 732 |
| 4 |
|
| 5 |
Modified: |
| 6 |
trunk/gentoolkit/ChangeLog |
| 7 |
trunk/gentoolkit/pym/gentoolkit/metadata.py |
| 8 |
Log: |
| 9 |
Fix epkginfo to not traceback if herds.xml is not in the tree |
| 10 |
|
| 11 |
Modified: trunk/gentoolkit/ChangeLog |
| 12 |
=================================================================== |
| 13 |
--- trunk/gentoolkit/ChangeLog 2010-01-07 22:28:36 UTC (rev 731) |
| 14 |
+++ trunk/gentoolkit/ChangeLog 2010-01-08 21:38:33 UTC (rev 732) |
| 15 |
@@ -1,3 +1,7 @@ |
| 16 |
+2009-01-08: Paul Varner <fuzzyray@g.o> |
| 17 |
+ * epkginfo/equery: Fix expkinfo to not traceback if herds.xml is not |
| 18 |
+ present in the tree. (Bug 300108) |
| 19 |
+ |
| 20 |
2009-12-17: Paul Varner <fuzzyray@g.o> |
| 21 |
* revdep-rebuild: Fix revdep-rebuild to properly honor |
| 22 |
PORTAGE_NICENESS as an incremental to the current nice level (Bug |
| 23 |
|
| 24 |
Modified: trunk/gentoolkit/pym/gentoolkit/metadata.py |
| 25 |
=================================================================== |
| 26 |
--- trunk/gentoolkit/pym/gentoolkit/metadata.py 2010-01-07 22:28:36 UTC (rev 731) |
| 27 |
+++ trunk/gentoolkit/pym/gentoolkit/metadata.py 2010-01-08 21:38:33 UTC (rev 732) |
| 28 |
@@ -205,7 +205,10 @@ |
| 29 |
|
| 30 |
if self._herdstree is None: |
| 31 |
herds_path = os.path.join(settings['PORTDIR'], 'metadata/herds.xml') |
| 32 |
- self._herdstree = etree.parse(herds_path) |
| 33 |
+ try: |
| 34 |
+ self._herdstree = etree.parse(herds_path) |
| 35 |
+ except IOError: |
| 36 |
+ return None |
| 37 |
|
| 38 |
# Some special herds are not listed in herds.xml |
| 39 |
if herd in ('no-herd', 'maintainer-wanted', 'maintainer-needed'): |
Archives