Merge branch 'notsystemd/postmove' into notsystemd/master

1 files changed, 1 insertions, 6 deletions

diff --git a/tools/xml_helper.py b/tools/xml_helper.py
index 598b33f655..e87126f2f7 100644
--- a/tools/xml_helper.py
+++ b/tools/xml_helper.py
@@ -17,17 +17,12 @@
 #  You should have received a copy of the GNU Lesser General Public License
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
 
-import os.path
 from lxml import etree as tree
 
 class CustomResolver(tree.Resolver):
     def resolve(self, url, id, context):
-        topsrcdir = os.path.dirname(os.path.dirname(__file__))
         if 'custom-entities.ent' in url:
-            return self.resolve_filename(os.path.join(topsrcdir, 'man/custom-entities.ent.in'), context)
-        f = os.path.join(topsrcdir, 'man', os.path.basename(url))
-        if os.path.isfile(f):
-            return self.resolve_filename(f, context)
+            return self.resolve_filename('man/custom-entities.ent', context)
 
 _parser = tree.XMLParser()
 _parser.resolvers.add(CustomResolver())