egencache: don't require xml in global scope

diff --git a/bin/egencache b/bin/egencache
index a87394c0d8d62c5a8a4bb7e15391b277b65f16f1..53ae565827964c40268b2a177caec3d013d829b4 100755 (executable)
--- a/bin/egencache
+++ b/bin/egencache
@@ -368,14 +368,6 @@ class GenCache(object):
                                        "committing target: %s\n" % (ce,),
                                        level=logging.ERROR, noiselevel=-1)
 
-class _MetadataTreeBuilder(ElementTree.TreeBuilder):
-       """
-       Implements doctype() as required to avoid deprecation warnings with
-       >=python-2.7.
-       """
-       def doctype(self, name, pubid, system):
-               pass
-
 class GenUseLocalDesc(object):
        def __init__(self, portdb, output=None,
                        preserve_comments=False):
@@ -480,6 +472,14 @@ class GenUseLocalDesc(object):
                                        return 1
                        return (a > b) - (a < b)
 
+               class _MetadataTreeBuilder(ElementTree.TreeBuilder):
+                       """
+                       Implements doctype() as required to avoid deprecation warnings
+                       since Python >=2.7
+                       """
+                       def doctype(self, name, pubid, system):
+                               pass
+
                for cp in self._portdb.cp_all():
                        metadata_path = os.path.join(repo_path, cp, 'metadata.xml')
                        try: