summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Kalnischkies <kalnischkies@gmail.com>2011-06-29 23:16:00 +0200
committerDavid Kalnischkies <kalnischkies@gmail.com>2011-06-29 23:16:00 +0200
commit1925ea3d0cd6579a4034acb7308e532d025319c7 (patch)
tree01ae992a818e1d8a3d0deaef9e778b9a96944abb
parent5b7d1ee67575e311871fb73be421ea7fd2f6fd73 (diff)
Defaults is a vector of Pin not of PkgPin
-rw-r--r--apt-pkg/policy.cc2
-rw-r--r--debian/changelog3
2 files changed, 3 insertions, 2 deletions
diff --git a/apt-pkg/policy.cc b/apt-pkg/policy.cc
index 291d83c67..827c9145c 100644
--- a/apt-pkg/policy.cc
+++ b/apt-pkg/policy.cc
@@ -210,7 +210,7 @@ void pkgPolicy::CreatePin(pkgVersionMatch::MatchType Type,string Name,
{
if (Name.empty() == true)
{
- Pin *P = &*Defaults.insert(Defaults.end(),PkgPin());
+ Pin *P = &*Defaults.insert(Defaults.end(),Pin());
P->Type = Type;
P->Priority = Priority;
P->Data = Data;
diff --git a/debian/changelog b/debian/changelog
index e527142c4..c4f7af623 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,8 +14,9 @@ apt (0.8.15.1) unstable; urgency=low
* apt-pkg/policy.cc:
- do not segfault in pinning if a package with this name doesn't exist.
Thanks to Ferdinand Thommes for the report!
+ - Defaults is a vector of Pin not of PkgPin
- -- David Kalnischkies <kalnischkies@gmail.com> Wed, 29 Jun 2011 22:05:50 +0200
+ -- David Kalnischkies <kalnischkies@gmail.com> Wed, 29 Jun 2011 23:15:35 +0200
apt (0.8.15) unstable; urgency=low