diff --git a/auto-update-debuginfo.patch b/auto-update-debuginfo.patch new file mode 100644 index 0000000..5c3e5aa --- /dev/null +++ b/auto-update-debuginfo.patch @@ -0,0 +1,24 @@ +From: Zdeněk Pavlas +Date: Thu, 11 Aug 2011 12:34:42 +0000 (+0200) +Subject: Fix check for repos in opts, in auto-update-debuginfo plugin. BZ 729964. +X-Git-Url: http://yum.baseurl.org/gitweb?p=yum-utils.git;a=commitdiff_plain;h=efb3c7b3fb96523bb5997c163bf4e33ab897f1b8 + + Fix check for repos in opts, in auto-update-debuginfo plugin. BZ 729964. + + Also hasattr(None, 'repos') == False, so we don't need +to check for None explicitly. +--- + +diff --git a/plugins/auto-update-debuginfo/auto-update-debuginfo.py b/plugins/auto-update-debuginfo/auto-update-debuginfo.py +index 39993ad..9ff927c 100644 +--- a/plugins/auto-update-debuginfo/auto-update-debuginfo.py ++++ b/plugins/auto-update-debuginfo/auto-update-debuginfo.py +@@ -38,7 +38,7 @@ def _check_man_disable(mdrs, di): + def enable_debuginfo_repos(yb, conduit): + mdrs = set() + opts, args = conduit.getCmdLine() +- if opts is not None and hasattr(opts.repos) : ++ if hasattr(opts, 'repos'): + for opt, repoexp in opts.repos: + if opt == '--disablerepo': + mdrs.add(repoexp) diff --git a/yum-utils.spec b/yum-utils.spec index 4524bbe..b71aeae 100644 --- a/yum-utils.spec +++ b/yum-utils.spec @@ -3,10 +3,11 @@ Summary: Utilities based around the yum package manager Name: yum-utils Version: 1.1.31 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: Development/Tools Source: http://yum.baseurl.org/download/yum-utils/%{name}-%{version}.tar.gz +Patch0: auto-update-debuginfo.patch URL: http://yum.baseurl.org/download/yum-utils/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -380,6 +381,7 @@ Supplies checksums for files in packages from puppet's state file. %prep %setup -q +%patch0 -p1 %install rm -rf $RPM_BUILD_ROOT @@ -677,6 +679,9 @@ fi /usr/lib/yum-plugins/puppetverify.* %changelog +* Thu Aug 13 2011 Tim Lauridsen +- fix traceback in auto-update-debuginfo plugin (rhbz #729982) + * Thu Aug 10 2011 Tim Lauridsen - mark as 1.1.31 - remove patches