[packages/yum] fix parsing loading of .yumtx (saved yum transactions) in regards of kernel module packages

[glen]

commit 8a54bfd190cf814da1783681dd0885602de7c18c
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sat May 18 11:44:48 2013 +0300

    fix parsing loading of .yumtx (saved yum transactions) in regards of kernel module packages

 yum-pkgspec-at.patch | 26 ++++++++++++++++++++++++++
 yum.spec             |  5 +++--
 2 files changed, 29 insertions(+), 2 deletions(-)
---
diff --git a/yum.spec b/yum.spec
index 08e629a..ea26526 100644
--- a/yum.spec
+++ b/yum.spec
@@ -36,6 +36,7 @@ Patch10:	rpm5-%{name}.patch
 Patch11:	rpm5-caps.patch
 Patch12:	%{name}-missingok.patch
 Patch13:	%{name}-info-no-size.patch
+Patch14:	%{name}-pkgspec-at.patch
 # fc
 Patch100:	%{name}-HEAD.patch
 # Patch100-md5:	e9eff22b1a68e83b271bdec261411648
@@ -64,8 +65,7 @@ Requires:	python >= 1:2.5
 Requires:	python-iniparse
 Requires:	python-libxml2
 Requires:	python-pygpgme
-Requires:	python-rpm >=  %{rpm_ver}
-Requires:	rpm >= %{rpm_ver}
+Requires:	python-rpm >= %{rpm_ver}
 Requires:	python-sqlite
 Requires:	python-urlgrabber >= 1:3.9.1
 Requires:	rpm >= %{rpm_ver}
@@ -119,6 +119,7 @@ bash-completion for Yum.
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
+%patch14 -p1
 
 %build
 %{__make}
diff --git a/yum-pkgspec-at.patch b/yum-pkgspec-at.patch
new file mode 100644
index 0000000..1d9e3aa
--- /dev/null
+++ b/yum-pkgspec-at.patch
@@ -0,0 +1,26 @@
+--- site-packages/yum/__init__.py~	2013-05-18 11:39:40.000000000 +0300
++++ site-packages/yum/__init__.py	2013-05-18 11:39:43.178065996 +0300
+@@ -6745,7 +6745,10 @@
+             elif k in ('updated_by', 'obsoleted_by', 'downgraded_by', 
+                        'downgrades', 'updates', 'obsoletes', 'depends_on'):
+                 for pkgspec in v.strip().split(' '):
+-                    pkgtup, origin  = pkgspec.split('@')
++                    # PLD kernel addon packages use '@' as part of RELEASE tag
++                    parts = pkgspec.split('@')
++                    pkgtup = '@'.join(parts[:-1])
++                    origin = '@'.join(parts[-1:])
+                     try:
+                         if origin == 'i':
+                             po = self.getInstalledPackageObject(tuple(pkgtup.split(',')))
+@@ -6762,7 +6765,10 @@
+             elif k in ('relatedto'):
+                 for item in v.split(' '):
+                     pkgspec, rel = item.split(':')
+-                    pkgtup,origin = pkgspec.split('@')
++                    # PLD kernel addon packages use '@' as part of RELEASE tag
++                    parts = pkgspec.split('@')
++                    pkgtup = '@'.join(parts[:-1])
++                    origin = '@'.join(parts[-1:])
+                     try:
+                         if origin == 'i':
+                             po = self.getInstalledPackageObject(tuple(pkgtup.split(',')))
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/yum.git/commitdiff/8a54bfd190cf814da1783681dd0885602de7c18c