rpms/apt/devel apt-0.5.15lorg3.93-repomd-assert.patch, NONE, 1.1 apt.spec, 1.47, 1.48

[Panu Matilainen (pmatilai)]

Author: pmatilai

Update of /cvs/pkgs/rpms/apt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23730

Modified Files:
	apt.spec 
Added Files:
	apt-0.5.15lorg3.93-repomd-assert.patch 
Log Message:
- Fix assert failure when repomd.xml isn't available locally (#389361)


apt-0.5.15lorg3.93-repomd-assert.patch:

--- NEW FILE apt-0.5.15lorg3.93-repomd-assert.patch ---
commit 40dc6292aaa1ffa9c06fd94b276f378411b3b629
Author: Panu Matilainen <pmatilai at laiskiainen.org>
Date:   Mon Nov 19 09:09:39 2007 +0200

    Fix assert failure in some cases where repomd.xml can't be found

diff --git a/apt-pkg/rpm/rpmindexfile.cc b/apt-pkg/rpm/rpmindexfile.cc
index 937712a..1e1eb22 100644
--- a/apt-pkg/rpm/rpmindexfile.cc
+++ b/apt-pkg/rpm/rpmindexfile.cc
@@ -561,7 +561,12 @@ string rpmRepomdIndex::ArchiveInfo(pkgCache::VerIterator Ver) const
 }
 pkgCache::PkgFileIterator rpmRepomdIndex::FindInCache(pkgCache &Cache) const
 {
-   string FileName = IndexPath();
+   string FileName = "";
+   /* repomd requires release to be present to find any other files */
+   if (FileExists(ReleasePath())) {
+      FileName = IndexPath();
+   }
+
    pkgCache::PkgFileIterator File = Cache.FileBegin();
    for (; File.end() == false; File++)
    {


Index: apt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/apt/devel/apt.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- apt.spec	16 Nov 2007 10:23:04 -0000	1.47
+++ apt.spec	19 Nov 2007 07:13:52 -0000	1.48
@@ -6,7 +6,7 @@
 Summary: Debian's Advanced Packaging Tool with RPM support
 Name: apt
 Version: 0.5.15lorg3.93
-Release: 3%{?dist}
+Release: 4%{?dist}
 Group: System Environment/Base
 URL: http://apt-rpm.org/
 # SourceLicense: GPLv2+ except lua/ which is MIT
@@ -38,6 +38,8 @@
 Patch1: apt-0.5.15lorg3.x-cache-corruption.patch
 # multilib obsoletes hackery (#353271)
 Patch2: apt-0.5.15lorg3.93-multilib-obsoletes-hack.patch
+# avoid assertion failure when repomd.xml doesn't exist
+Patch3: apt-0.5.15lorg3.93-repomd-assert.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
@@ -123,6 +125,7 @@
 %patch0 -p1 -b .ppc
 %patch1 -p0 -b .mmap
 %patch2 -p1 -b .obsoletes-hack
+%patch3 -p1 -b .repomd-assert
 
 install -pm 644 %{SOURCE19} comps2prio.xsl
 
@@ -288,6 +291,9 @@
 
 
 %changelog
+* Mon Nov 19 2007 Panu Matilainen <pmatilai at redhat.com> 0.5.15lorg3.93-4
+- Fix assert failure when repomd.xml isn't available locally (#389361)
+
 * Fri Nov 16 2007 Panu Matilainen <pmatilai at redhat.com> 0.5.15lorg3.93-3
 - Hackery to help (multilib) obsoletes (#353271)
 - Drop termcap + libtermcap from rpmpriorities to avoid installing needlessly