Browse code
yum fixes for distroverpkg and repo url parse
Change-Id: Ia64c215db0a0f0f7c733cb879e7d34a8838ccafe
Reviewed-on: http://photon-jenkins.eng.vmware.com/858
Tested-by: jenkins-photon <wangnan2015@hotmail.com>
Reviewed-by: Sharath George
ppadmavilasom authored on 2016/05/12 10:00:54Showing 3 changed files
| 1 | 1 |
new file mode 100644 |
| ... | ... |
@@ -0,0 +1,12 @@ |
| 0 |
+--- a/yum/parser.py 2016-05-11 22:13:12.315196522 +0000 |
|
| 1 |
+@@ -7,7 +7,7 @@ |
|
| 2 |
+ import Errors |
|
| 3 |
+ |
|
| 4 |
+ |
|
| 5 |
+-_KEYCRE = re.compile(r"\$(\w+)") |
|
| 6 |
++_KEYCRE = re.compile(r"\$([^-_]+)") |
|
| 7 |
+ |
|
| 8 |
+ def varReplace(raw, vars): |
|
| 9 |
+ '''Perform variable replacement |
|
| 10 |
+ |
| ... | ... |
@@ -1,7 +1,7 @@ |
| 1 | 1 |
Summary: RPM installer/updater |
| 2 | 2 |
Name: yum |
| 3 | 3 |
Version: 3.4.3 |
| 4 |
-Release: 3%{?dist}
|
|
| 4 |
+Release: 4%{?dist}
|
|
| 5 | 5 |
License: GPLv2+ |
| 6 | 6 |
Group: System Environment/Base |
| 7 | 7 |
Source0: %{name}-%{version}.tar.gz
|
| ... | ... |
@@ -195,6 +195,8 @@ touch $RPM_BUILD_ROOT/var/lib/yum/uuid |
| 195 | 195 |
%exclude %{_mandir}/man*/yum-updatesd*
|
| 196 | 196 |
|
| 197 | 197 |
%changelog |
| 198 |
+* Wed May 11 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 3.4.3-4 |
|
| 199 |
+- Fix to read photon repo files, set distroverpkg to photon-release |
|
| 198 | 200 |
* Thu Apr 28 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 3.4.3-3 |
| 199 | 201 |
- Add python-xml dependency |
| 200 | 202 |
* Mon Jun 22 2015 Divya Thaluru <dthaluru@vmware.com> 3.4.3-2 |