diff options
| author | Zac Medico <zmedico@gentoo.org> | 2010-09-06 15:11:42 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-09-06 15:11:42 -0700 |
| commit | d67b2f75cd77984282e6e8d454c98e015619d125 (patch) | |
| tree | 1564a4abae0201325b37871b95fbc7655a5f89b5 /pym/_emerge/EbuildPhase.py | |
| parent | 84238b2d0912c68cc679d11ec1240140bb314da1 (diff) | |
| download | portage-d67b2f75cd77984282e6e8d454c98e015619d125.tar.gz portage-d67b2f75cd77984282e6e8d454c98e015619d125.tar.bz2 portage-d67b2f75cd77984282e6e8d454c98e015619d125.zip | |
Replace the settings and herdstree parameters for the MetaDataXML
constructor with a single herds parameter that can be either a
path to a herds.xml, or a pre-parsed ElementTree.
Diffstat (limited to 'pym/_emerge/EbuildPhase.py')
| -rw-r--r-- | pym/_emerge/EbuildPhase.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pym/_emerge/EbuildPhase.py b/pym/_emerge/EbuildPhase.py index 75dd123ff..117471335 100644 --- a/pym/_emerge/EbuildPhase.py +++ b/pym/_emerge/EbuildPhase.py @@ -39,8 +39,10 @@ class EbuildPhase(CompositeTask): maint_str = "" metadata_xml_path = os.path.join(os.path.dirname(self.settings['EBUILD']), "metadata.xml") if os.path.isfile(metadata_xml_path): + herds_path = os.path.join(self.settings['PORTDIR'], + 'metadata/herds.xml') try: - metadata_xml = MetaDataXML(metadata_xml_path, self.settings) + metadata_xml = MetaDataXML(metadata_xml_path, herds_path) maint_str = metadata_xml.format_maintainer_string() except SyntaxError: maint_str = "<invalid metadata.xml>" |