X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/d4887f3c78c2e12c074551003e88dfc609cc6b5a..b1a8717ae8e07101cfae03b978d57b793884a3d9:/apt-pkg/policy.cc?ds=sidebyside diff --git a/apt-pkg/policy.cc b/apt-pkg/policy.cc index 98439cd57..d8b8825c2 100644 --- a/apt-pkg/policy.cc +++ b/apt-pkg/policy.cc @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: policy.cc,v 1.8 2001/05/27 23:40:56 jgg Exp $ +// $Id: policy.cc,v 1.10 2003/08/12 00:17:37 mdz Exp $ /* ###################################################################### Package Version Policy implementation @@ -183,7 +183,7 @@ void pkgPolicy::CreatePin(pkgVersionMatch::MatchType Type,string Name, Pin *P = 0; if (Name.empty() == true) - P = &*Defaults.insert(Defaults.end()); + P = &*Defaults.insert(Defaults.end(),PkgPin()); else { // Get a spot to put the pin @@ -197,7 +197,7 @@ void pkgPolicy::CreatePin(pkgVersionMatch::MatchType Type,string Name, P = &*I; if (P == 0) - P = &*Unmatched.insert(Unmatched.end()); + P = &*Unmatched.insert(Unmatched.end(),PkgPin()); } else { @@ -293,8 +293,14 @@ bool ReadPinFile(pkgPolicy &Plcy,string File) } for (; Word != End && isspace(*Word) != 0; Word++); - Plcy.CreatePin(Type,Name,string(Word,End), - Tags.FindI("Pin-Priority")); + short int priority = Tags.FindI("Pin-Priority", 0); + if (priority == 0) + { + _error->Warning(_("No priority (or zero) specified for pin")); + continue; + } + + Plcy.CreatePin(Type,Name,string(Word,End),priority); } Plcy.InitDefaults();