Hello community,
here is the log from the commit of package dnf-plugins-core for
openSUSE:Factory checked in at 2019-04-28 20:11:40
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/dnf-plugins-core (Old)
and /work/SRC/openSUSE:Factory/.dnf-plugins-core.new.5536 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dnf-plugins-core"
Sun Apr 28 20:11:40 2019 rev:7 rq:698420 version:4.0.6
Changes:
--------
--- /work/SRC/openSUSE:Factory/dnf-plugins-core/dnf-plugins-core.changes
2019-04-01 12:39:59.289961893 +0200
+++
/work/SRC/openSUSE:Factory/.dnf-plugins-core.new.5536/dnf-plugins-core.changes
2019-04-28 20:12:06.114468873 +0200
@@ -1,0 +2,8 @@
+Fri Apr 26 12:42:24 UTC 2019 - Neal Gompa <ngomp...@gmail.com>
+
+- Backport fix for copr disable command traceback (rh#1693551)
+ * Patch: 0001-Fix-copr-disable-command-traceback-RhBug-1693551.patch
+- Backport doc fix to state repoid as repo identifier for config-manager
(rh#1686779)
+ * Patch: 0002-doc-state-repoid-as-repo-identifier-of-config-manage.patch
+
+-------------------------------------------------------------------
New:
----
0001-Fix-copr-disable-command-traceback-RhBug-1693551.patch
0002-doc-state-repoid-as-repo-identifier-of-config-manage.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ dnf-plugins-core.spec ++++++
--- /var/tmp/diff_new_pack.YKPwYN/_old 2019-04-28 20:12:06.874468401 +0200
+++ /var/tmp/diff_new_pack.YKPwYN/_new 2019-04-28 20:12:06.894468388 +0200
@@ -43,6 +43,10 @@
Url: https://github.com/rpm-software-management/dnf-plugins-core
Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz
+# Backports from upstream
+Patch0001: 0001-Fix-copr-disable-command-traceback-RhBug-1693551.patch
+Patch0002: 0002-doc-state-repoid-as-repo-identifier-of-config-manage.patch
+
BuildArch: noarch
BuildRequires: cmake
++++++ 0001-Fix-copr-disable-command-traceback-RhBug-1693551.patch ++++++
>From 3bbae8fb4f73dede47741331eb2bdd3a4bf47176 Mon Sep 17 00:00:00 2001
From: Jaroslav Rohel <jro...@redhat.com>
Date: Thu, 28 Mar 2019 15:29:00 +0100
Subject: [PATCH 1/2] Fix: copr disable command traceback (RhBug:1693551)
The "modify" argument of write_raw_configfile method must be
a dictionary with strings.
Closes: #329
Approved by: m-blaha
---
plugins/copr.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/plugins/copr.py b/plugins/copr.py
index 10cf5f9..8a43593 100644
--- a/plugins/copr.py
+++ b/plugins/copr.py
@@ -518,7 +518,7 @@ Do you really want to enable
{0}?""".format('/'.join([self.copr_hostname,
.format(copr_username, copr_projectname)))
self.base.conf.write_raw_configfile(repo.repofile, repo.id,
- self.base.conf.substitutions,
{"enabled": 0})
+ self.base.conf.substitutions,
{"enabled": "0"})
@classmethod
def _get_data(cls, f):
--
2.20.1
++++++ 0002-doc-state-repoid-as-repo-identifier-of-config-manage.patch ++++++
>From f6dcc8bab12cd85bb5b99c12ddb3c168c38462af Mon Sep 17 00:00:00 2001
From: Jaroslav Mracek <jmra...@redhat.com>
Date: Thu, 28 Mar 2019 18:45:21 +0100
Subject: [PATCH 2/2] [doc] state repoid as repo identifier of config-manager
(RhBug:1686779)
It explicitly states that config-manager accept a repoid. Using the
repoid is the best way because it is unique identificator of
the repository.
https://bugzilla.redhat.com/show_bug.cgi?id=1686779
---
doc/config_manager.rst | 21 +++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
diff --git a/doc/config_manager.rst b/doc/config_manager.rst
index 360bb8f..2feafcb 100644
--- a/doc/config_manager.rst
+++ b/doc/config_manager.rst
@@ -26,15 +26,15 @@ repositories are enabled or disabled, and add new
repositories.
Synopsis
--------
-``dnf config-manager [options] <repo>...``
+``dnf config-manager [options] <repoid>...``
---------
Arguments
---------
-``<repo>``
- Display / modify specified repository. If not specified display / modify
main DNF configuration.
- Repositories can be specified using globs.
+``<repoid>``
+ Display / modify a repository identified by <repoid>. If not specified,
display / modify
+ main DNF configuration. Repositories can be specified using globs.
-------
Options
@@ -71,11 +71,12 @@ Examples
``dnf config-manager --dump``
Display main DNF configuration.
-``dnf config-manager repo --dump``
- Display configuration of repo.
+``dnf config-manager <repoid> --dump``
+ Display configuration of a repository identified by <repoid>.
-``dnf config-manager --set-enabled repo``
- Enable repo and make the change permanent.
+``dnf config-manager --set-enabled <repoid>``
+ Enable repository identified by <repoid> and make the change permanent.
-``dnf config-manager --setopt proxy=http://proxy.example.com:3128/ repo1 repo2
--save``
- Update proxy setting in repo1 and repo2 and make the change permanent.
+``dnf config-manager --setopt proxy=http://proxy.example.com:3128/ <repo1>
<repo2> --save``
+ Update proxy setting in repositories with repoid <repo1> and <repo2> and
make the change
+ permanent.
--
2.20.1
