Browse Source

* implement SourceVer() in pkgRecords

(thanks to Daniel Burrows for the patch!)
debian/1.8.y
Michael Vogt 15 years ago
parent
commit
c2f2b86252
  1. 28
      apt-pkg/deb/debrecords.cc
  2. 1
      apt-pkg/deb/debrecords.h
  3. 1
      apt-pkg/pkgrecords.h
  4. 2
      debian/changelog

28
apt-pkg/deb/debrecords.cc

@ -92,18 +92,44 @@ string debRecordParser::LongDesc()
return Section.FindS("Description");
}
/*}}}*/
static const char *SourceVerSeparators = " ()";
// RecordParser::SourcePkg - Return the source package name if any /*{{{*/
// ---------------------------------------------------------------------
/* */
string debRecordParser::SourcePkg()
{
string Res = Section.FindS("Source");
string::size_type Pos = Res.find(' ');
string::size_type Pos = Res.find_first_of(SourceVerSeparators);
if (Pos == string::npos)
return Res;
return string(Res,0,Pos);
}
/*}}}*/
// RecordParser::SourceVer - Return the source version number if present /*{{{*/
// ---------------------------------------------------------------------
/* */
string debRecordParser::SourceVer()
{
string Pkg = Section.FindS("Source");
string::size_type Pos = Pkg.find_first_of(SourceVerSeparators);
if (Pos == string::npos)
return "";
string::size_type VerStart = Pkg.find_first_not_of(SourceVerSeparators, Pos);
if(VerStart == string::npos)
return "";
string::size_type VerEnd = Pkg.find_first_of(SourceVerSeparators, VerStart);
if(VerEnd == string::npos)
// Corresponds to the case of, e.g., "foo (1.2" without a closing
// paren. Be liberal and guess what it means.
return string(Pkg, VerStart);
else
return string(Pkg, VerStart, VerEnd - VerStart);
}
/*}}}*/
// RecordParser::GetRec - Return the whole record /*{{{*/
// ---------------------------------------------------------------------
/* */

1
apt-pkg/deb/debrecords.h

@ -38,6 +38,7 @@ class debRecordParser : public pkgRecords::Parser
virtual string MD5Hash();
virtual string SHA1Hash();
virtual string SourcePkg();
virtual string SourceVer();
// These are some general stats about the package
virtual string Maintainer();

1
apt-pkg/pkgrecords.h

@ -58,6 +58,7 @@ class pkgRecords::Parser
virtual string MD5Hash() {return string();};
virtual string SHA1Hash() {return string();};
virtual string SourcePkg() {return string();};
virtual string SourceVer() {return string();};
// These are some general stats about the package
virtual string Maintainer() {return string();};

2
debian/changelog

@ -1,5 +1,7 @@
apt (0.6.47) UNRELEASED; urgency=low
* implement SourceVer() in pkgRecords
(thanks to Daniel Burrows for the patch!)
* apt-pkg/algorithm.cc:
- use clog for all debugging
- only increase the score of installed applications if they

Loading…
Cancel
Save