Update to 2.1.3-1
This commit is contained in:
Jaroslav Mracek
parent
2198208b78
commit
7e65353a7a
1
.gitignore
vendored
1
.gitignore
vendored
@ -30,3 +30,4 @@
|
||||
/dnf-plugins-core-2.1.0.tar.gz
|
||||
/dnf-plugins-core-2.1.1.tar.gz
|
||||
/dnf-plugins-core-2.1.2.tar.gz
|
||||
/dnf-plugins-core-2.1.3.tar.gz
|
||||
|
||||
@ -1,89 +0,0 @@
|
||||
From 366dbf4c3561a769a47dec10653aeb65db289437 Mon Sep 17 00:00:00 2001
|
||||
From: Igor Gnatenko <ignatenko@redhat.com>
|
||||
Date: Sun, 2 Jul 2017 11:34:47 +0200
|
||||
Subject: [PATCH] Revert "Unify user confirmation in copr with dnf itself
|
||||
(RhBug:1436321)"
|
||||
|
||||
This reverts commit 479f1251558c62cad97f9f3ef8f22bc0c8dcc47f.
|
||||
---
|
||||
plugins/copr.py | 34 +++++++++++++++++++++++-----------
|
||||
1 file changed, 23 insertions(+), 11 deletions(-)
|
||||
|
||||
diff --git a/plugins/copr.py b/plugins/copr.py
|
||||
index ff7edd9..c09dc20 100644
|
||||
--- a/plugins/copr.py
|
||||
+++ b/plugins/copr.py
|
||||
@@ -37,6 +37,11 @@ PLUGIN_CONF = 'copr'
|
||||
YES = set([_('yes'), _('y')])
|
||||
NO = set([_('no'), _('n'), ''])
|
||||
|
||||
+# compatibility with Py2 and Py3 - rename raw_input() to input() on Py2
|
||||
+try:
|
||||
+ input = raw_input
|
||||
+except NameError:
|
||||
+ pass
|
||||
if PY3:
|
||||
from configparser import ConfigParser
|
||||
else:
|
||||
@@ -145,7 +150,7 @@ class CoprCommand(dnf.cli.Command):
|
||||
.format(self.base.conf.get_reposdir, copr_username, copr_projectname)
|
||||
if subcommand == "enable":
|
||||
self._need_root()
|
||||
- msg = _("""
|
||||
+ self._ask_user("""
|
||||
You are about to enable a Copr repository. Please note that this
|
||||
repository is not part of the main distribution, and quality may vary.
|
||||
|
||||
@@ -157,8 +162,7 @@ and packages are not held to any quality or security level.
|
||||
Please do not file bug reports about these packages in Fedora
|
||||
Bugzilla. In case of problems, contact the owner of this repository.
|
||||
|
||||
-Do you want to continue?""")
|
||||
- self._ask_user(msg)
|
||||
+Do you want to continue? [y/N]: """)
|
||||
self._download_repo(project_name, repo_filename, chroot)
|
||||
logger.info(_("Repository successfully enabled."))
|
||||
elif subcommand == "disable":
|
||||
@@ -225,11 +229,20 @@ Do you want to continue?""")
|
||||
formatted = self.base.output.fmtSection(text)
|
||||
print(formatted)
|
||||
|
||||
- def _ask_user(self, msg):
|
||||
- if self.base._promptWanted():
|
||||
- if self.base.conf.assumeno or not self.base.output.userconfirm(
|
||||
- msg='{} [y/N]: '.format(msg), defaultyes_msg='{} [Y/n]: '.format(msg)):
|
||||
- raise dnf.exceptions.Error(_('Safe and good answer. Exiting.'))
|
||||
+ def _ask_user(self, question):
|
||||
+ if self.base.conf.assumeyes and not self.base.conf.assumeno:
|
||||
+ return
|
||||
+ elif self.base.conf.assumeno and not self.base.conf.assumeyes:
|
||||
+ raise dnf.exceptions.Error(_('Safe and good answer. Exiting.'))
|
||||
+
|
||||
+ answer = None
|
||||
+ while not ((answer in YES) or (answer in NO)):
|
||||
+ answer = ucd(input(question)).lower()
|
||||
+ answer = _(answer)
|
||||
+ if answer in YES:
|
||||
+ return
|
||||
+ else:
|
||||
+ raise dnf.exceptions.Error(_('Safe and good answer. Exiting.'))
|
||||
|
||||
@classmethod
|
||||
def _need_root(cls):
|
||||
@@ -352,11 +365,10 @@ class PlaygroundCommand(CoprCommand):
|
||||
|
||||
def _cmd_enable(self, chroot):
|
||||
self._need_root()
|
||||
- msg = _("""
|
||||
+ self._ask_user("""
|
||||
You are about to enable a Playground repository.
|
||||
|
||||
-Do you want to continue?""")
|
||||
- self._ask_user(msg)
|
||||
+Do you want to continue? [y/N]: """)
|
||||
api_url = "{0}/api/playground/list/".format(
|
||||
self.copr_url)
|
||||
f = self.base.urlopen(api_url, mode="w+")
|
||||
--
|
||||
2.13.2
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
%{?!dnf_lowest_compatible: %global dnf_lowest_compatible 2.4.0}
|
||||
%{?!dnf_lowest_compatible: %global dnf_lowest_compatible 2.6.1}
|
||||
%{?!dnf_not_compatible: %global dnf_not_compatible 3.0}
|
||||
%global dnf_plugins_extra 2.0.0
|
||||
%global hawkey_version 0.7.0
|
||||
@ -10,13 +10,12 @@
|
||||
%endif
|
||||
|
||||
Name: dnf-plugins-core
|
||||
Version: 2.1.2
|
||||
Release: 2%{?dist}
|
||||
Version: 2.1.3
|
||||
Release: 1%{?dist}
|
||||
Summary: Core Plugins for DNF
|
||||
License: GPLv2+
|
||||
URL: https://github.com/rpm-software-management/dnf-plugins-core
|
||||
Source0: %{url}/archive/%{name}-%{version}/%{name}-%{version}.tar.gz
|
||||
Patch0001: 0001-Revert-Unify-user-confirmation-in-copr-with-dnf-itse.patch
|
||||
BuildArch: noarch
|
||||
BuildRequires: cmake
|
||||
BuildRequires: gettext
|
||||
@ -219,6 +218,7 @@ Provides: dnf-command(migrate)
|
||||
Provides: dnf-plugins-extras-migrate = %{version}-%{release}
|
||||
Conflicts: dnf-plugins-extras-common-data < %{dnf_plugins_extra}
|
||||
Obsoletes: python2-dnf-plugins-extras-migrate < %{dnf_plugins_extra}
|
||||
Obsoletes: python-dnf-plugins-extras-migrate < %{dnf_plugins_extra}
|
||||
|
||||
%description -n python2-dnf-plugin-migrate
|
||||
Migrate Plugin for DNF, Python 2 version. Migrates history, group and yumdb data from yum to dnf.
|
||||
@ -495,6 +495,14 @@ PYTHONPATH=./plugins nosetests-%{python3_version} -s tests/
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Mon Jul 24 2017 Jaroslav Mracek <jmracek@redhat.com> 2.1.3-1
|
||||
- Solve conflict with migrate plugin (RhBug:1470843) (Jaroslav Mracek)
|
||||
- Move copying to dnf (RhBug:1279001) (Ondřej Sojka)
|
||||
- Return 1 if dnf config-manager --add-repo fails (RhBug:1439514) (Jaroslav
|
||||
Mracek)
|
||||
- bump minimal dnf version to 2.6.0 (Igor Gnatenko)
|
||||
- trivial: remove whitespace at end of line (Igor Gnatenko)
|
||||
|
||||
* Sun Jul 02 2017 Igor Gnatenko <ignatenkO@redhat.com> - 2.1.2-2
|
||||
- Fix crash in COPR plugin
|
||||
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (dnf-plugins-core-2.1.2.tar.gz) = 2a47f8ef3a33f2d52b44d8a930bdbe95b07fb7e4d61a273dc6fe558ec659b0a9323062be0fad86b7ab6d5beaddd4f31a2e2842450f590cbb5619978d625fc92e
|
||||
SHA512 (dnf-plugins-core-2.1.3.tar.gz) = 19a954a06b062fa16bf648e3f5827dffbc7b9878b8542336a8f585b5898b7a3a79485571ca6d2e198271a8bb876696d02f238d7ec6b73b9ddf817057ff974efb
|
||||
|
||||
Loading…
Reference in New Issue
Block a user