@@ -5,7 +5,7 @@

 -_KEYCRE = re.compile(r"\$(\w+)")

-+_KEYCRE = re.compile(r"\$([^-_]+)")

++_KEYCRE = re.compile(r"\$([a-zA-Z0-9]+)")

  def varReplace(raw, vars):

      '''Perform variable replacement

new file mode 100644

@@ -0,0 +1,13 @@

+diff --git a/yum/__init__.py b/yum/__init__.py

+index 99039e0..003adda 100644

+--- a/yum/__init__.py

+@@ -490,7 +490,7 @@ class YumBase(depsolve.Depsolve):

+             repo.name = section

+             self.logger.error(_('Repository %r is missing name in configuration, '

+                     'using id') % section)

+-        repo.name = to_unicode(repo.name)

++        repo.name = to_unicode(varReplace(repo.name, self.conf.yumvar))

+ 

+         # Set attributes not from the config file

+         repo.basecachedir = self.conf.cachedir

@@ -1,12 +1,13 @@

 Summary:        RPM installer/updater

 Name:           yum

 Version:        3.4.3

-Release:        7%{?dist}

+Release:        8%{?dist}

 License:        GPLv2+

 Group:          System Environment/Base

 Source0:        %{name}-%{version}.tar.gz

 Patch0:         yumconf.patch

 Patch1:         parser.patch

+Patch2:         yum-repo-name.patch

 %define sha1    yum=8ec5d339e4518a7908fd4db0721740288a3d8b6c

 URL:            http://yum.baseurl.org/

 Vendor:         VMware, Inc.

@@ -78,6 +79,7 @@ automatically, prompting the user for permission as necessary.

 %setup -q

 %patch0 -p1

 %patch1 -p1

+%patch2 -p1

 %build

 make

@@ -200,6 +202,8 @@ touch $RPM_BUILD_ROOT/var/lib/yum/uuid

 %exclude %{_mandir}/man*/yum-updatesd*

 %changelog

+*   Wed Aug 23 2017 Xiaolin Li <xiaolinl@vmware.com> 3.4.3-8

+-   Replaced variables in repo name.

 *   Wed Mar 29 2017 Xiaolin Li <xiaolinl@vmware.com> 3.4.3-7

 -   Added python-rpm to requires.

 *   Mon Jun 06 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 3.4.3-6