rpms/apt/devel apt-shell-155990.patch,NONE,1.1 apt.spec,1.15,1.16
Ville Skytta (scop)
fedora-extras-commits at redhat.com
Thu Apr 28 20:57:09 UTC 2005
Author: scop
Update of /cvs/extras/rpms/apt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3383
Modified Files:
apt.spec
Added Files:
apt-shell-155990.patch
Log Message:
Fix for #155990 from Panu.
apt-shell-155990.patch:
--- NEW FILE apt-shell-155990.patch ---
Index: cmdline/apt-shell.cc
===================================================================
--- cmdline/apt-shell.cc (revision 373)
+++ cmdline/apt-shell.cc (revision 374)
@@ -1328,9 +1328,9 @@
}
}
vector<string> GoodSolutionNames;
- for (int i = 0; i != GoodSolutionNames.size(); i++)
+ for (int i = 0; i != GoodSolutions.size(); i++)
{
- pkgCache::PkgIterator GoodPkg(Cache, GoodSolutions[0]);
+ pkgCache::PkgIterator GoodPkg(Cache, GoodSolutions[i]);
GoodSolutionNames.push_back(GoodPkg.Name());
}
#ifdef WITH_LUA
@@ -1339,6 +1339,7 @@
vector<string> VS;
_lua->SetDepCache(&Cache);
_lua->SetDontFix();
+ _lua->SetGlobal("virtualname", Pkg.Name());
_lua->SetGlobal("packages", GoodSolutions);
_lua->SetGlobal("packagenames", GoodSolutionNames);
_lua->SetGlobal("selected");
Index: apt.spec
===================================================================
RCS file: /cvs/extras/rpms/apt/devel/apt.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- apt.spec 19 Apr 2005 18:26:22 -0000 1.15
+++ apt.spec 28 Apr 2005 20:57:07 -0000 1.16
@@ -8,7 +8,7 @@
Summary: Debian's Advanced Packaging Tool with RPM support
Name: apt
Version: 0.5.15cnc7
-Release: 4
+Release: 5
Group: System Environment/Base
URL: https://moin.conectiva.com.br/AptRpm
License: GPL
@@ -83,6 +83,7 @@
# Work around missing deps in rpm-devel :-/
BuildRequires: beecrypt-devel, elfutils-libelf-devel
+Patch0: apt-shell-155990.patch
# Fix some issues in python binding build
Patch1: apt-pymake.patch
Patch5: apt-0.5.15cnc6-pymake2.patch
@@ -137,6 +138,7 @@
%prep
%setup -q
+%patch0 -p0 -b .155990
%patch1 -p0 -b .pymake
%patch3 -p1 -b .manifest
%patch5 -p0 -b .pymake2
@@ -333,10 +335,12 @@
%changelog
+* Thu Apr 28 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.5.15cnc7-5
+- Fix apt-shell "install kernel" crash (#155990, Panu Matilainen).
+
* Tue Apr 19 2005 Seth Vidal <skvidal at phy.duke.edu>
- tobuild test
-
* Fri Apr 1 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.5.15cnc7-3
- Include apt-pkg includedir in -devel package
More information about the fedora-extras-commits
mailing list