[yum/f17] ui_id: prevent TB on invalid repos with no URLs. BZ 870691.

[Zdeněk Pavlas]

commit 2091398c9b346967a6e1c448bdb16f227702b83b
Author: Zdeněk Pavlas <zpavlas at redhat.com>
Date:   Mon Jan 7 08:58:04 2013 +0100

    ui_id: prevent TB on invalid repos with no URLs.  BZ 870691.

 ...-prevent-TB-on-invalid-repos-with-no-URLs.patch |   28 ++++++++++++++++++++
 yum.spec                                           |    7 ++++-
 2 files changed, 34 insertions(+), 1 deletions(-)
---
diff --git a/ui_id-prevent-TB-on-invalid-repos-with-no-URLs.patch b/ui_id-prevent-TB-on-invalid-repos-with-no-URLs.patch
new file mode 100644
index 0000000..000ec51
--- /dev/null
+++ b/ui_id-prevent-TB-on-invalid-repos-with-no-URLs.patch
@@ -0,0 +1,28 @@
+From 40d9d5f4c3a00b2efa6ee0b64fe4d1ec52d46a69 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zden=C4=9Bk=20Pavlas?= <zpavlas at redhat.com>
+Date: Mon, 29 Oct 2012 09:22:02 +0100
+Subject: [PATCH] ui_id: prevent TB on invalid repos with no URLs.  BZ 870691.
+
+---
+ yum/yumRepo.py |    4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
+
+diff --git a/yum/yumRepo.py b/yum/yumRepo.py
+index e362c43..414f1d9 100644
+--- a/yum/yumRepo.py
++++ b/yum/yumRepo.py
+@@ -381,8 +381,10 @@ class YumRepository(Repository, config.RepoConf):
+                 val = ini['metalink']
+             elif 'mirrorlist' in ini:
+                 val = ini['mirrorlist']
+-            else:
++            elif 'baseurl' in ini:
+                 val = ini['baseurl']
++            else:
++                val = ''
+         ret = self.id
+         if '$releasever' in val:
+             ret += '/'
+-- 
+1.7.4.4
+
diff --git a/yum.spec b/yum.spec
index 073898c..2f031e8 100644
--- a/yum.spec
+++ b/yum.spec
@@ -18,7 +18,7 @@
 Summary: RPM package installer/updater/manager
 Name: yum
 Version: 3.4.3
-Release: 30%{?dist}
+Release: 31%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://yum.baseurl.org/download/3.4/%{name}-%{version}.tar.gz
@@ -32,6 +32,7 @@ Patch7: yum-ppc64-preferred.patch
 Patch8: BZ-803346-no-only-update.patch
 Patch20: yum-manpage-files.patch
 Patch21: yum-completion-helper.patch
+Patch22: ui_id-prevent-TB-on-invalid-repos-with-no-URLs.patch
 
 URL: http://yum.baseurl.org/
 BuildArchitectures: noarch
@@ -141,6 +142,7 @@ Install this package if you want auto yum updates nightly via cron.
 %patch8 -p1
 %patch20 -p1
 %patch21 -p1
+%patch22 -p1
 %patch1 -p1
 
 %build
@@ -315,6 +317,9 @@ exit 0
 %endif
 
 %changelog
+* Mon Jan 7 2012 Zdenek Pavlas <zpavlas at redhat.com> - 3.4.3-31
+- ui_id: prevent TB on invalid repos with no URLs.  BZ 870691.
+
 * Mon Nov 12 2012 Zdenek Pavlas <zpavlas at redhat.com> - 3.4.3-30
 - update to HEAD as of Oct 16 2012 (just before --downloadonly
   and yum-cron changes)