rebase to dnf-2-modularity-6 release

This commit is contained in:
Martin Hatina 2018-05-25 15:04:04 +02:00
parent 34d90c0e5d
commit 8d1c31a72d
4 changed files with 1097 additions and 237 deletions

2
.gitignore vendored
View File

@ -109,3 +109,5 @@
/dnf-2.7.5-modularity-2.tar.gz /dnf-2.7.5-modularity-2.tar.gz
/dnf-2.7.5-modularity-3.tar.gz /dnf-2.7.5-modularity-3.tar.gz
/dnf-2.7.5-modularity-4.tar.gz /dnf-2.7.5-modularity-4.tar.gz
/dnf-2.7.5-modularity-5.tar.gz
/dnf-2.7.5-modularity-6.tar.gz

View File

@ -1,22 +0,0 @@
From 5842971b6df574b214806fcc286114813d370e1d Mon Sep 17 00:00:00 2001
From: Daniel Mach <dmach@redhat.com>
Date: Wed, 18 Apr 2018 16:13:59 +0200
Subject: [PATCH] Fix defaults loading.
---
dnf/module/metadata_loader.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dnf/module/metadata_loader.py b/dnf/module/metadata_loader.py
index 78e7f051..150b66f0 100644
--- a/dnf/module/metadata_loader.py
+++ b/dnf/module/metadata_loader.py
@@ -61,4 +61,4 @@ class ModuleMetadataLoader(object):
if PY3:
modules_yaml = modules_yaml.decode("utf-8")
- return Modulemd.Module.new_all_from_string(modules_yaml)
+ return Modulemd.Module.new_all_from_string_ext(modules_yaml)
--
2.17.0

1266
dnf.spec

File diff suppressed because it is too large Load Diff

View File

@ -1 +1 @@
SHA512 (dnf-2.7.5-modularity-4.tar.gz) = 3f2baa8f1dd713b2637c788f41a2070cb3847e7e18edf853bc9c9bb5534aa59f3438cdf406ae28e31d614cf7480c4a06d47651c09a2a17a13948112c96a90ba6 SHA512 (dnf-2.7.5-modularity-6.tar.gz) = c10b3fca4a73467c92a253a2ab4b93b3be1deeeb4a0a0c3574eff32c413fd1ffbd8b4b731a0197dc2ed03b155591b610de907d5f5e02e360f8dd86d82293933a