From: Paulo Vital <pvital@linux.vnet.ibm.com> Add new regex to also recognize Fedora 24 ISO images. Signed-off-by: Paulo Vital <pvital@linux.vnet.ibm.com> --- isoinfo.py | 1 + 1 file changed, 1 insertion(+) diff --git a/isoinfo.py b/isoinfo.py index 7c000b7..d7ca044 100644 --- a/isoinfo.py +++ b/isoinfo.py @@ -119,6 +119,7 @@ iso_dir = [ ('ubuntu', lambda m: m.group(2), '[Uu]buntu(-Server)? (\d+\.\d+)'), ('fedora', lambda m: m.group(1), 'Fedora[ -](\d+)'), ('fedora', lambda m: m.group(1), 'Fedora.*-(\d+)-'), + ('fedora', lambda m: m.group(1), 'Fedora-[\w-]+-(\d+)'), ('gentoo', lambda m: m.group(1), 'Gentoo Linux \w+ (\d+)'), ('powerkvm', 'live_cd', 'POWERKVM_LIVECD'), ('arch', lambda m: m.group(1), 'ARCH_(\d+)'), -- 2.5.5

Patch set failed to execute as-is in my env. This is the error being thrown: DistroLoader: failed to parse distro file: /home/danielhb/kimchi/wok_all_plugins/src/wok/plugins/kimchi/distros.d/fedora.json KCHDL0002E: KCHDL0002E Traceback (most recent call last): File "src/wokd", line 106, in <module> sys.exit(main(sys.argv[1:])) File "src/wokd", line 103, in main wok.server.main(options) File "/home/danielhb/kimchi/wok_all_plugins/src/wok/server.py", line 250, in main srv = Server(options) File "/home/danielhb/kimchi/wok_all_plugins/src/wok/server.py", line 182, in __init__ self._load_plugins(options) File "/home/danielhb/kimchi/wok_all_plugins/src/wok/server.py", line 203, in _load_plugins plugin_app = import_class(plugin_class)(options) File "/home/danielhb/kimchi/wok_all_plugins/src/wok/plugins/kimchi/root.py", line 51, in __init__ self.model = kimchiModel.Model() File "/home/danielhb/kimchi/wok_all_plugins/src/wok/plugins/kimchi/model/model.py", line 71, in __init__ models.append(instance(**kargs)) File "/home/danielhb/kimchi/wok_all_plugins/src/wok/plugins/kimchi/model/config.py", line 201, in __init__ self._distros = DistrosModel() File "/home/danielhb/kimchi/wok_all_plugins/src/wok/plugins/kimchi/model/config.py", line 179, in __init__ self.distros = distroloader.get() File "/home/danielhb/kimchi/wok_all_plugins/src/wok/plugins/kimchi/distroloader.py", line 62, in get distros.extend(self._get_json_info(f)) File "/home/danielhb/kimchi/wok_all_plugins/src/wok/plugins/kimchi/distroloader.py", line 55, in _get_json_info raise OperationFailed("KCHDL0002E", msg_args) wok.exception.OperationFailed: KCHDL0002E: KCHDL0002E I've fixed it with the following change: diff --git a/distros.d/fedora.json b/distros.d/fedora.json index ef16451..a38f706 100644 --- a/distros.d/fedora.json +++ b/distros.d/fedora.json @@ -40,14 +40,14 @@ "os_arch": "ppc64", "os_version": "20", "path": "http://mirrors.kernel.org/fedora-secondary/releases/20/Fedora/ppc64/iso/Fedo..." - } + }, { "name": "Fedora 23 (PPC64)", "os_distro": "fedora", "os_arch": "ppc64", "os_version": "23", "path": "http://mirrors.kernel.org/fedora-secondary/releases/23/Server/ppc64/iso/Fedo..." - } + }, { "name": "Fedora 23 (PPC64 LE)", "os_distro": "fedora", Daniel On 06/22/2016 12:02 PM, pvital@linux.vnet.ibm.com wrote:

From: Paulo Vital <pvital@linux.vnet.ibm.com>

This patch-set adds support to recognize Fedora 24 ISO images and add new optins for remote Fedora images.

Paulo Vital (2): Issue #965: Recognize Fedora 24 ISO image. Update Fedora remote images.

distros.d/fedora.json | 32 +++++++++++++++++++++++--------- isoinfo.py | 1 + 2 files changed, 24 insertions(+), 9 deletions(-)

-- 2.5.5

_______________________________________________ Kimchi-devel mailing list Kimchi-devel@ovirt.org http://lists.ovirt.org/mailman/listinfo/kimchi-devel