From bbbcc1dff8735db8158014b729e9c9973da19c56 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Mon, 21 Jan 2008 17:13:54 -0500 Subject: [PATCH] Always use the discinfo file from the exploaded tree. It doesn't change. Also, close the file when we're done. --- src/pypungi/pungi.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/pypungi/pungi.py b/src/pypungi/pungi.py index 12dc53be..0395da8a 100755 --- a/src/pypungi/pungi.py +++ b/src/pypungi/pungi.py @@ -312,11 +312,9 @@ class Pungi(pypungi.PungiBase): """Create the split metadata for the isos""" - if self.config.getint('default', 'discs') > 1: - discinfo = open('%s-disc1/.discinfo' % self.topdir, 'r').readlines() - else: - discinfo = open(os.path.join(self.topdir, '.discinfo'), 'r').readlines() + discinfo = open(os.path.join(self.topdir, '.discinfo'), 'r').readlines() mediaid = discinfo[0].rstrip('\n') + discinfo.close() compsfile = os.path.join(self.workdir, '%s-%s-comps.xml' % (self.config.get('default', 'name'), self.config.get('default', 'version')))