From f4253b5440631463a2c34741ec96773c54f1353d Mon Sep 17 00:00:00 2001 From: Lubomír Sedlář Date: Dec 12 2016 14:58:40 +0000 Subject: Fix default value for krb_rdns options --- diff --git a/0001-Default-krb_rdns-to-None.patch b/0001-Default-krb_rdns-to-None.patch new file mode 100644 index 0000000..36ba43d --- /dev/null +++ b/0001-Default-krb_rdns-to-None.patch @@ -0,0 +1,36 @@ +From 65a0d9c726d19ac594de003f83eb69a58ea21a4f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= +Date: Mon, 12 Dec 2016 15:08:30 +0100 +Subject: [PATCH] Default krb_rdns to None +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Using `False` as default value will break setups where the value is not +specified and is expected to be `True`; for example `rhpkg` will not be +able to talk to Brew. + +This patch removes the empty value, so that the option is only used when +actually specified in config. + +Signed-off-by: Lubomír Sedlář +--- + pyrpkg/__init__.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/pyrpkg/__init__.py b/pyrpkg/__init__.py +index e3fd456..247356f 100644 +--- a/pyrpkg/__init__.py ++++ b/pyrpkg/__init__.py +@@ -248,7 +248,7 @@ class Commands(object): + 'topurl': 'http://localhost/kojiroot', + 'use_fast_upload': None, + 'weburl': 'http://localhost/koji', +- 'krb_rdns': False, ++ 'krb_rdns': None, + } + + # Process the configs in order, global, user, then any option passed +-- +2.9.3 + diff --git a/rpkg.spec b/rpkg.spec index 0bbca21..4a22d14 100644 --- a/rpkg.spec +++ b/rpkg.spec @@ -3,13 +3,14 @@ Name: rpkg Version: 1.47 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Utility for interacting with rpm+git packaging systems Group: Applications/System License: GPLv2+ and LGPLv2 URL: https://pagure.io/rpkg Source0: https://pagure.io/releases/rpkg/rpkg-%{version}.tar.gz +Patch0: 0001-Default-krb_rdns-to-None.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: pyrpkg >= %{version}-%{release} @@ -62,6 +63,7 @@ A python library for managing RPM package sources in a git repository. %prep %setup -q +%patch0 -p1 %build @@ -96,6 +98,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Dec 12 2016 Lubomír Sedlář - 1.47-5 +- Fix default value for krb_rdns options + * Mon Dec 12 2016 Lubomír Sedlář - 1.47-4 - Add krb_rdns koji config