this is too outdated and will be moved to CentOS
This commit is contained in:
Igor Gnatenko
parent
70d2a33ffb
commit
8f3b331701
|
|
@ -1,88 +0,0 @@
|
|||
/dnf-3f2389e.tar.xz
|
||||
/dnf-b74addd.tar.xz
|
||||
/dnf-72fd0b8.tar.xz
|
||||
/dnf-632e1eb.tar.xz
|
||||
/dnf-8ac0959.tar.xz
|
||||
/dnf-5dea6e7.tar.xz
|
||||
/dnf-b06d183.tar.xz
|
||||
/dnf-9da1268.tar.xz
|
||||
/dnf-832ecd1.tar.xz
|
||||
/dnf-da60a96.tar.xz
|
||||
/dnf-ea72d9a.tar.xz
|
||||
/dnf-4831982.tar.xz
|
||||
/dnf-5d85f6b.tar.xz
|
||||
/dnf-9f050eb.tar.xz
|
||||
/dnf-6a055e6.tar.xz
|
||||
/dnf-3701ad6.tar.xz
|
||||
/dnf-b901926.tar.xz
|
||||
/dnf-dec970f.tar.xz
|
||||
/dnf-e7d9c11.tar.xz
|
||||
/dnf-050524e.tar.xz
|
||||
/dnf-97180b8.tar.xz
|
||||
/dnf-4c0def8.tar.xz
|
||||
/dnf-3e52d13.tar.xz
|
||||
/dnf-7b1d503.tar.xz
|
||||
/dnf-f3818b4.tar.xz
|
||||
/dnf-8b435e9.tar.xz
|
||||
/dnf-91ba5e0.tar.xz
|
||||
/dnf-03fd687.tar.xz
|
||||
/dnf-85c924f.tar.xz
|
||||
/dnf-24ce938.tar.xz
|
||||
/dnf-f8bdc98.tar.xz
|
||||
/dnf-da9f862.tar.xz
|
||||
/dnf-85524ae.tar.xz
|
||||
/dnf-eff4c49.tar.xz
|
||||
/dnf-eb9dddb.tar.xz
|
||||
/dnf-7d717c7.tar.xz
|
||||
/dnf-bfccb5c.tar.xz
|
||||
/dnf-55e6369.tar.xz
|
||||
/dnf-4b96ea8.tar.xz
|
||||
/dnf-c1716d7.tar.xz
|
||||
/dnf-83504fe.tar.xz
|
||||
/dnf-e113d94.tar.xz
|
||||
/dnf-57d1d09.tar.xz
|
||||
/dnf-cc96d1f.tar.xz
|
||||
/dnf-e200267.tar.xz
|
||||
/dnf-7db68be.tar.xz
|
||||
/dnf-ceb088e.tar.xz
|
||||
/dnf-44f5516.tar.xz
|
||||
/dnf-3baa9cb.tar.xz
|
||||
/dnf-a64f78a.tar.xz
|
||||
/dnf-1566248.tar.xz
|
||||
/dnf-2c0cf93.tar.xz
|
||||
/dnf-a0828fa.tar.xz
|
||||
/dnf-2f8923e.tar.xz
|
||||
/dnf-9d95442.tar.xz
|
||||
/dnf-cfa9c14.tar.xz
|
||||
/dnf-b81a7e5.tar.xz
|
||||
/dnf-b89c961.tar.xz
|
||||
/dnf-ac73cac.tar.xz
|
||||
/dnf-895cb6e.tar.xz
|
||||
/dnf-261c295.tar.xz
|
||||
/dnf-c44cc44.tar.xz
|
||||
/dnf-272eb06.tar.xz
|
||||
/dnf-70d6e3b.tar.xz
|
||||
/dnf-2aa5c6b.tar.xz
|
||||
/dnf-fe34987.tar.xz
|
||||
/dnf-2c846d0.tar.xz
|
||||
/dnf-da278da.tar.xz
|
||||
/dnf-e1a35e5.tar.xz
|
||||
/dnf-9e8fd6b.tar.xz
|
||||
/dnf-84ccd1a.tar.xz
|
||||
/dnf-a7e0aa1.tar.xz
|
||||
/dnf-13dce34.tar.xz
|
||||
/dnf-3a22891.tar.xz
|
||||
/dnf-719208b.tar.xz
|
||||
/dnf-0.6.5.tar.gz
|
||||
/dnf-1.0.0.tar.gz
|
||||
/dnf-1.0.1.tar.gz
|
||||
/dnf-1.0.2.tar.gz
|
||||
/dnf-1.1.0.tar.gz
|
||||
/dnf-1.1.1.tar.gz
|
||||
/dnf-1.1.2.tar.gz
|
||||
/dnf-1.1.3.tar.gz
|
||||
/dnf-1.1.4.tar.gz
|
||||
/dnf-1.1.5.tar.gz
|
||||
/dnf-1.1.6.tar.gz
|
||||
/dnf-1.1.7.tar.gz
|
||||
/dnf-1.1.8.tar.gz
|
||||
|
|
@ -1,104 +0,0 @@
|
|||
From ab986180f9c67d37b6fe826c0348cebaefe6d81a Mon Sep 17 00:00:00 2001
|
||||
From: Igor Gnatenko <ignatenko@redhat.com>
|
||||
Date: Fri, 29 Apr 2016 14:53:07 +0200
|
||||
Subject: [PATCH] Revert "using ts.addReinstall for package reinstallation
|
||||
(RhBug:1071854)"
|
||||
|
||||
This reverts commit 516aad977e108df0f99c0bfc03a25b180888937f.
|
||||
|
||||
reinstall stuff implemented in rpm 4.12 which we don't have backported into epel7
|
||||
|
||||
Signed-off-by: Igor Gnatenko <ignatenko@redhat.com>
|
||||
---
|
||||
dnf/base.py | 4 ++++
|
||||
dnf/cli/commands/reinstall.py | 1 +
|
||||
dnf/rpm/transaction.py | 1 -
|
||||
dnf/transaction.py | 6 +++---
|
||||
tests/test_transaction.py | 3 ++-
|
||||
5 files changed, 10 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/dnf/base.py b/dnf/base.py
|
||||
index abb22ac..f56b4f6 100644
|
||||
--- a/dnf/base.py
|
||||
+++ b/dnf/base.py
|
||||
@@ -1603,6 +1603,7 @@ class Base(object):
|
||||
|
||||
def reinstall(self, pkg_spec, old_reponame=None, new_reponame=None,
|
||||
new_reponame_neq=None, remove_na=False):
|
||||
+ self._add_reinstall_rpm_probfilters()
|
||||
subj = dnf.subject.Subject(pkg_spec)
|
||||
q = subj.get_best_query(self.sack)
|
||||
installed_pkgs = [
|
||||
@@ -1768,6 +1769,7 @@ class Base(object):
|
||||
assert len(obsoleteds_) == 1
|
||||
obsoleteds.append(obsoleteds_[0])
|
||||
assert len(news) == 1
|
||||
+ self._add_reinstall_rpm_probfilters()
|
||||
self._transaction.add_reinstall(first(olds), news[0],
|
||||
obsoleteds)
|
||||
|
||||
@@ -1914,6 +1916,8 @@ class Base(object):
|
||||
myrepos += '\n'
|
||||
self.history.write_addon_data('config-repos', myrepos)
|
||||
|
||||
+ def _add_reinstall_rpm_probfilters(self):
|
||||
+ self.rpm_probfilter.add(rpm.RPMPROB_FILTER_REPLACEPKG)
|
||||
|
||||
def _msg_installed(pkg):
|
||||
name = ucd(pkg)
|
||||
diff --git a/dnf/cli/commands/reinstall.py b/dnf/cli/commands/reinstall.py
|
||||
index b0294c2..7b01345 100644
|
||||
--- a/dnf/cli/commands/reinstall.py
|
||||
+++ b/dnf/cli/commands/reinstall.py
|
||||
@@ -75,6 +75,7 @@ class ReinstallCommand(commands.Command):
|
||||
local_pkgs = map(self.base.add_remote_rpm, filenames)
|
||||
results = map(self.base.package_reinstall, local_pkgs)
|
||||
done = functools.reduce(operator.or_, results, False)
|
||||
+ self.base._add_reinstall_rpm_probfilters()
|
||||
|
||||
# Reinstall packages.
|
||||
for pkg_spec in pkg_specs:
|
||||
diff --git a/dnf/rpm/transaction.py b/dnf/rpm/transaction.py
|
||||
index cfb4f61..117aec1 100644
|
||||
--- a/dnf/rpm/transaction.py
|
||||
+++ b/dnf/rpm/transaction.py
|
||||
@@ -25,7 +25,6 @@ class TransactionWrapper(object):
|
||||
'order',
|
||||
'addErase',
|
||||
'addInstall',
|
||||
- 'addReinstall',
|
||||
'run',
|
||||
'pgpImportPubkey',
|
||||
'pgpPrtPkts',
|
||||
diff --git a/dnf/transaction.py b/dnf/transaction.py
|
||||
index 5cec604..1e2f584 100644
|
||||
--- a/dnf/transaction.py
|
||||
+++ b/dnf/transaction.py
|
||||
@@ -186,9 +186,9 @@ class Transaction(object):
|
||||
else:
|
||||
ts.addInstall(hdr, tsi, 'i')
|
||||
elif tsi.op_type == REINSTALL:
|
||||
- # note: in rpm 4.12 there should not be set
|
||||
- # rpm.RPMPROB_FILTER_REPLACEPKG to work
|
||||
- ts.addReinstall(tsi.installed.header, tsi)
|
||||
+ ts.addErase(tsi.erased.idx)
|
||||
+ hdr = tsi.installed.header
|
||||
+ ts.addInstall(hdr, tsi, 'i')
|
||||
elif tsi.op_type == UPGRADE:
|
||||
hdr = tsi.installed.header
|
||||
ts.addInstall(hdr, tsi, 'u')
|
||||
diff --git a/tests/test_transaction.py b/tests/test_transaction.py
|
||||
index a82dce2..c0aeb54 100644
|
||||
--- a/tests/test_transaction.py
|
||||
+++ b/tests/test_transaction.py
|
||||
@@ -211,5 +211,6 @@ class RPMProbFilters(tests.support.TestCase):
|
||||
self.base._sack = tests.support.mock_sack('main')
|
||||
self.base._goal = dnf.goal.Goal(self.base.sack)
|
||||
self.base.reinstall("librita")
|
||||
- expected = rpm.rpm.RPMPROB_FILTER_OLDPACKAGE
|
||||
+ expected = rpm.RPMPROB_FILTER_REPLACEPKG |\
|
||||
+ rpm.rpm.RPMPROB_FILTER_OLDPACKAGE
|
||||
self.base.ts.setProbFilter.assert_called_with(expected)
|
||||
--
|
||||
2.7.4
|
||||
|
||||
|
|
@ -1,29 +0,0 @@
|
|||
From b4ce001377b3aaead543b0a1e6da86305bf933c2 Mon Sep 17 00:00:00 2001
|
||||
From: Igor Gnatenko <ignatenko@redhat.com>
|
||||
Date: Tue, 12 Apr 2016 17:12:15 +0200
|
||||
Subject: [PATCH] bash-completion: first try to set fallback to
|
||||
BASH_COMPLETION_COMPATDIR
|
||||
|
||||
Signed-off-by: Igor Gnatenko <ignatenko@redhat.com>
|
||||
---
|
||||
etc/bash_completion.d/CMakeLists.txt | 6 +++++-
|
||||
1 file changed, 5 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/etc/bash_completion.d/CMakeLists.txt b/etc/bash_completion.d/CMakeLists.txt
|
||||
index ebee298..be81310 100644
|
||||
--- a/etc/bash_completion.d/CMakeLists.txt
|
||||
+++ b/etc/bash_completion.d/CMakeLists.txt
|
||||
@@ -1,5 +1,9 @@
|
||||
find_package(bash-completion QUIET)
|
||||
if(NOT BASH_COMPLETION_COMPLETIONSDIR)
|
||||
- set(BASH_COMPLETION_COMPLETIONSDIR "${SYSCONFDIR}/bash_completion.d")
|
||||
+ if(BASH_COMPLETION_COMPATDIR)
|
||||
+ set(BASH_COMPLETION_COMPLETIONSDIR ${BASH_COMPLETION_COMPATDIR})
|
||||
+ else()
|
||||
+ set(BASH_COMPLETION_COMPLETIONSDIR "${SYSCONFDIR}/bash_completion.d")
|
||||
+ endif()
|
||||
endif()
|
||||
install(FILES "dnf" DESTINATION ${BASH_COMPLETION_COMPLETIONSDIR})
|
||||
--
|
||||
2.7.3
|
||||
|
||||
|
|
@ -1,82 +0,0 @@
|
|||
From 6e854bed3827e33ec51af2bfd738c8e8cc76ad65 Mon Sep 17 00:00:00 2001
|
||||
From: Jan Silhan <jsilhan@redhat.com>
|
||||
Date: Mon, 9 Mar 2015 14:27:53 +0100
|
||||
Subject: [PATCH 3/4] better file pattern recognition (RhBug:1195385)
|
||||
|
||||
fixes regration introduced in c388ac6
|
||||
---
|
||||
dnf/subject.py | 3 ++-
|
||||
tests/repos/main.repo | 1 +
|
||||
tests/test_install.py | 18 +++++++++++++++---
|
||||
3 files changed, 18 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/dnf/subject.py b/dnf/subject.py
|
||||
index e5ed68d..660cbd8 100644
|
||||
--- a/dnf/subject.py
|
||||
+++ b/dnf/subject.py
|
||||
@@ -25,6 +25,7 @@ from dnf.util import first, is_glob_pattern
|
||||
|
||||
import dnf.selector
|
||||
import hawkey
|
||||
+import re
|
||||
|
||||
class Subject(object):
|
||||
# :api
|
||||
@@ -77,7 +78,7 @@ class Subject(object):
|
||||
|
||||
@property
|
||||
def filename_pattern(self):
|
||||
- return self.subj.pattern.find('/') != -1
|
||||
+ return re.search(r"^\*?/", self.subj.pattern)
|
||||
|
||||
@property
|
||||
def pattern(self):
|
||||
diff --git a/tests/repos/main.repo b/tests/repos/main.repo
|
||||
index 380c193..e44ca4e 100644
|
||||
--- a/tests/repos/main.repo
|
||||
+++ b/tests/repos/main.repo
|
||||
@@ -19,4 +19,5 @@
|
||||
=Pkg: trampoline 2.1 1 noarch
|
||||
=Prv: henry(the_horse)
|
||||
=Prv: splendid = 2.1
|
||||
+=Prv: php(a/b)
|
||||
=Prv: /all/be/there
|
||||
diff --git a/tests/test_install.py b/tests/test_install.py
|
||||
index e0da4e6..afee8d2 100644
|
||||
--- a/tests/test_install.py
|
||||
+++ b/tests/test_install.py
|
||||
@@ -30,8 +30,8 @@ class CommonTest(support.ResultTestCase):
|
||||
|
||||
- contains a package "lotus-3-17.x86_64" (The package can be installed.)
|
||||
- contains a package "lotus-3-17.i686" (The package can be installed.)
|
||||
- - contains a package "trampoline-2.1-1.noarch" that contains "*/there" and
|
||||
- provides "splendid > 2.0" (The package can be installed.)
|
||||
+ - contains a package "trampoline-2.1-1.noarch" that contains "*/there",
|
||||
+ provides "splendid > 2.0" and "php(a/b)" (The package can be installed.)
|
||||
- contains a package "mrkite-2-0.x86_64" (The package can be installed
|
||||
together with the package "trampoline".)
|
||||
- contains a package "mrkite-k-h-1-1.x86_64" (The package can be
|
||||
@@ -61,7 +61,19 @@ class CommonTest(support.ResultTestCase):
|
||||
"""Test that the pkg to be installed can be specified by fname glob."""
|
||||
self.base.install("*/there")
|
||||
(installed, _) = self.installed_removed(self.base)
|
||||
- self.assertCountEqual(map(str, installed), ('trampoline-2.1-1.noarch',))
|
||||
+ self.assertCountEqual(map(str, installed),
|
||||
+ ('trampoline-2.1-1.noarch',))
|
||||
+
|
||||
+ self.base.install("/all/*/there")
|
||||
+ (installed, _) = self.installed_removed(self.base)
|
||||
+ self.assertCountEqual(map(str, installed),
|
||||
+ ('trampoline-2.1-1.noarch',))
|
||||
+
|
||||
+ def test_install_provide_glob(self):
|
||||
+ self.base.install("php(a/b)")
|
||||
+ (installed, _) = self.installed_removed(self.base)
|
||||
+ self.assertCountEqual(map(str, installed),
|
||||
+ ('trampoline-2.1-1.noarch',))
|
||||
|
||||
def test_install_name(self):
|
||||
"""Test that the package to be installed can be specified by name."""
|
||||
--
|
||||
2.4.3
|
||||
|
||||
|
|
@ -0,0 +1 @@
|
|||
this is too outdated and will be moved to CentOS
|
||||
Loading…
Reference in New Issue