diff options
Diffstat (limited to 'meta/recipes-devtools/dnf')
-rw-r--r-- | meta/recipes-devtools/dnf/dnf/0040-Keep-installed-packages-in-upgrade-job-RhBug-1728252.patch | 60 | ||||
-rw-r--r-- | meta/recipes-devtools/dnf/dnf_4.2.2.bb | 4 |
2 files changed, 63 insertions, 1 deletions
diff --git a/meta/recipes-devtools/dnf/dnf/0040-Keep-installed-packages-in-upgrade-job-RhBug-1728252.patch b/meta/recipes-devtools/dnf/dnf/0040-Keep-installed-packages-in-upgrade-job-RhBug-1728252.patch new file mode 100644 index 0000000000..57c2375a54 --- /dev/null +++ b/meta/recipes-devtools/dnf/dnf/0040-Keep-installed-packages-in-upgrade-job-RhBug-1728252.patch | |||
@@ -0,0 +1,60 @@ | |||
1 | From c88a77198c0156e425c2725f30e481207de5162f Mon Sep 17 00:00:00 2001 | ||
2 | From: Jaroslav Mracek <jmracek@redhat.com> | ||
3 | Date: Tue, 3 Sep 2019 11:01:51 +0200 | ||
4 | Subject: [PATCH] Keep installed packages in upgrade job | ||
5 | (RhBug:1728252,1644241,1741381) | ||
6 | |||
7 | In combination with marking of job as TARGETED it prevents from | ||
8 | reinstalling of modified packages with same NEVRA. | ||
9 | |||
10 | https://bugzilla.redhat.com/show_bug.cgi?id=1728252 | ||
11 | https://bugzilla.redhat.com/show_bug.cgi?id=1644241 | ||
12 | https://bugzilla.redhat.com/show_bug.cgi?id=1741381 | ||
13 | |||
14 | Closes: #1474 | ||
15 | Approved by: m-blaha | ||
16 | |||
17 | |||
18 | Backport to fix bug in dnf in oe-core | ||
19 | from https://github.com/rpm-software-management/dnf | ||
20 | |||
21 | Removed spec file portion of patch | ||
22 | |||
23 | Upstream-Status: Backport | ||
24 | Signed-off-by: Jate Sujjavanich <jatedev@gmail.com> | ||
25 | --- | ||
26 | dnf.spec | 4 ++-- | ||
27 | dnf/base.py | 3 --- | ||
28 | dnf/module/module_base.py | 2 +- | ||
29 | 3 files changed, 3 insertions(+), 6 deletions(-) | ||
30 | |||
31 | diff --git a/dnf/base.py b/dnf/base.py | ||
32 | index b2ced61..628c154 100644 | ||
33 | --- a/dnf/base.py | ||
34 | +++ b/dnf/base.py | ||
35 | @@ -1968,9 +1968,6 @@ class Base(object): | ||
36 | obsoletes=q.installed().union(q.upgrades())) | ||
37 | # add obsoletes into transaction | ||
38 | q = q.union(obsoletes) | ||
39 | - # provide only available packages to solver otherwise selection of available | ||
40 | - # possibilities will be ignored | ||
41 | - q = q.available() | ||
42 | if reponame is not None: | ||
43 | q.filterm(reponame=reponame) | ||
44 | q = self._merge_update_filters(q, pkg_spec=pkg_spec) | ||
45 | diff --git a/dnf/module/module_base.py b/dnf/module/module_base.py | ||
46 | index 976d730..ce70f63 100644 | ||
47 | --- a/dnf/module/module_base.py | ||
48 | +++ b/dnf/module/module_base.py | ||
49 | @@ -214,7 +214,7 @@ class ModuleBase(object): | ||
50 | |||
51 | if not upgrade_package_set: | ||
52 | logger.error(_("Unable to match profile in argument {}").format(spec)) | ||
53 | - query = self.base.sack.query().available().filterm(name=upgrade_package_set) | ||
54 | + query = self.base.sack.query().filterm(name=upgrade_package_set) | ||
55 | if query: | ||
56 | sltr = dnf.selector.Selector(self.base.sack) | ||
57 | sltr.set(pkg=query) | ||
58 | -- | ||
59 | 2.7.4 | ||
60 | |||
diff --git a/meta/recipes-devtools/dnf/dnf_4.2.2.bb b/meta/recipes-devtools/dnf/dnf_4.2.2.bb index a046ffc05d..6b6b233d6d 100644 --- a/meta/recipes-devtools/dnf/dnf_4.2.2.bb +++ b/meta/recipes-devtools/dnf/dnf_4.2.2.bb | |||
@@ -2,12 +2,13 @@ SUMMARY = "Package manager forked from Yum, using libsolv as a dependency resolv | |||
2 | DESCRIPTION = "Software package manager that installs, updates, and removes \ | 2 | DESCRIPTION = "Software package manager that installs, updates, and removes \ |
3 | packages on RPM-based Linux distributions. It automatically computes \ | 3 | packages on RPM-based Linux distributions. It automatically computes \ |
4 | dependencies and determines the actions required to install packages." | 4 | dependencies and determines the actions required to install packages." |
5 | HOMEPAGE = "https://github.com/rpm-software-management/dnf" | ||
5 | LICENSE = "GPLv2" | 6 | LICENSE = "GPLv2" |
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ | 7 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ |
7 | file://PACKAGE-LICENSING;md5=4a0548e303dbc77f067335b4d688e745 \ | 8 | file://PACKAGE-LICENSING;md5=4a0548e303dbc77f067335b4d688e745 \ |
8 | " | 9 | " |
9 | 10 | ||
10 | SRC_URI = "git://github.com/rpm-software-management/dnf.git \ | 11 | SRC_URI = "git://github.com/rpm-software-management/dnf.git;branch=master;protocol=https \ |
11 | file://0001-Corretly-install-tmpfiles.d-configuration.patch \ | 12 | file://0001-Corretly-install-tmpfiles.d-configuration.patch \ |
12 | file://0001-Do-not-hardcode-etc-and-systemd-unit-directories.patch \ | 13 | file://0001-Do-not-hardcode-etc-and-systemd-unit-directories.patch \ |
13 | file://0005-Do-not-prepend-installroot-to-logdir.patch \ | 14 | file://0005-Do-not-prepend-installroot-to-logdir.patch \ |
@@ -15,6 +16,7 @@ SRC_URI = "git://github.com/rpm-software-management/dnf.git \ | |||
15 | file://0030-Run-python-scripts-using-env.patch \ | 16 | file://0030-Run-python-scripts-using-env.patch \ |
16 | file://Fix-SyntaxWarning.patch \ | 17 | file://Fix-SyntaxWarning.patch \ |
17 | file://0001-set-python-path-for-completion_helper.patch \ | 18 | file://0001-set-python-path-for-completion_helper.patch \ |
19 | file://0040-Keep-installed-packages-in-upgrade-job-RhBug-1728252.patch \ | ||
18 | " | 20 | " |
19 | 21 | ||
20 | SRCREV = "9947306a55271b8b7c9e2b6e3b7d582885b6045d" | 22 | SRCREV = "9947306a55271b8b7c9e2b6e3b7d582885b6045d" |