diff options
| author | Arch Librarian <arch@canonical.com> | 2004-09-20 17:03:07 +0000 |
|---|---|---|
| committer | Arch Librarian <arch@canonical.com> | 2004-09-20 17:03:07 +0000 |
| commit | 5629863464d16497c87fd6e78c2f5dac62978448 (patch) | |
| tree | 7b65e1d785ae0394e2d2efa89db8febc5db47385 /apt-pkg/policy.cc | |
| parent | 47337f807e3feb6227ad172940520b303ec82241 (diff) | |
| download | apt-5629863464d16497c87fd6e78c2f5dac62978448.tar.gz | |
* Correct the section in apt_preferences(5) on interpre...
Author: mdz
Date: 2003-08-12 00:17:37 GMT
* Correct the section in apt_preferences(5) on interpreting priorities
to show that zero is not a valid priority, and print a warning if such
a pin is encountered in the preferences file (Closes: #204971)
Diffstat (limited to 'apt-pkg/policy.cc')
| -rw-r--r-- | apt-pkg/policy.cc | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/apt-pkg/policy.cc b/apt-pkg/policy.cc index 228d858a9..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.9 2002/11/06 06:43:14 jgg Exp $ +// $Id: policy.cc,v 1.10 2003/08/12 00:17:37 mdz Exp $ /* ###################################################################### Package Version Policy implementation @@ -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(); |