On 01/15/2014 07:58 PM, abotega(a)linux.vnet.ibm.com wrote:
From: Adriano Botega <abotega(a)linux.vnet.ibm.com>
V1 -> V2:
Addressed Mark's comment: Just add the hyphen to the matching characters set.
RHEL 7 is the next Red Hat Enterprise distro version and because of a difference in the
distro name in Volume Descriptor Table on it's ISO file, Kimchi is not recognizing as
a RHEL distro.
This patch adds the correct regex to add support to RHEL 7
Signed-off-by: Adriano Botega <abotega(a)linux.vnet.ibm.com>
---
src/kimchi/isoinfo.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/kimchi/isoinfo.py b/src/kimchi/isoinfo.py
index 7e6d733..62cce39 100644
--- a/src/kimchi/isoinfo.py
+++ b/src/kimchi/isoinfo.py
@@ -110,7 +110,7 @@ iso_dir = [
('opensuse', '12.2',
'openSUSE-DVD-i586-Build0167|openSUSE-DVD-x86_640167'),
('rhel', '4.8', 'RHEL/4-U8'),
- ('rhel', lambda m: m.group(1), 'RHEL[_/](\d+\.\d+)'),
+ ('rhel', lambda m: m.group(1), 'RHEL[_/-](\d+\.\d+)'),
('debian', lambda m: m.group(1), 'Debian (\d+\.\d+)'),
('ubuntu', lambda m: m.group(2), '[Uu]buntu(-Server)?
(\d+\.\d+)'),
('fedora', lambda m: m.group(1), 'Fedora[ -](\d+)'),
Reviewed-by: Mark Wu<wudxw(a)linux.vnet.ibm.com>