summaryrefslogtreecommitdiff
path: root/apt-pkg/vendorlist.cc
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2009-07-21 18:31:36 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2009-07-21 18:31:36 +0200
commitd59725349555939d39af81cf7746069d6aa3536c (patch)
tree90a85a3e4ffef76d9572ecf4a1dc8323f7ea38c9 /apt-pkg/vendorlist.cc
parent02e8ba352f71b82a936f5034059251425ab183d5 (diff)
parentc5f44afc2446d738e30ea4c6021d4b60915546b1 (diff)
The 'not dead yet' release
* add hook for MarkInstall and MarkDelete (closes: #470035) * add the various foldmarkers in apt-pkg & cmdline (no code change) * versions with a pin of -1 shouldn't be a candidate (Closes: #355237) * prefer mmap as memory allocator in MMap instead of a static char array which can (at least in theory) grow dynamic * eliminate (hopefully all) segfaults in pkgcachegen.cc and mmap.cc which can arise if cache doesn't fit into the mmap (Closes: #535218) * display warnings instead of errors if the parts dirs doesn't exist * honor the dpkg hold state in new Marker hooks (closes: #64141)
Diffstat (limited to 'apt-pkg/vendorlist.cc')
-rw-r--r--apt-pkg/vendorlist.cc19
1 files changed, 10 insertions, 9 deletions
diff --git a/apt-pkg/vendorlist.cc b/apt-pkg/vendorlist.cc
index 8e5d09e8a..589997081 100644
--- a/apt-pkg/vendorlist.cc
+++ b/apt-pkg/vendorlist.cc
@@ -10,7 +10,7 @@ pkgVendorList::~pkgVendorList()
delete *I;
}
-// pkgVendorList::ReadMainList - Read list of known package vendors /*{{{*/
+// pkgVendorList::ReadMainList - Read list of known package vendors /*{{{*/
// ---------------------------------------------------------------------
/* This also scans a directory of vendor files similar to apt.conf.d
which can contain the usual suspects of distribution provided data.
@@ -31,8 +31,8 @@ bool pkgVendorList::ReadMainList()
return CreateList(Cnf);
}
-
-bool pkgVendorList::Read(string File)
+ /*}}}*/
+bool pkgVendorList::Read(string File) /*{{{*/
{
Configuration Cnf;
if (ReadConfigFile(Cnf,File,true) == false)
@@ -40,8 +40,8 @@ bool pkgVendorList::Read(string File)
return CreateList(Cnf);
}
-
-bool pkgVendorList::CreateList(Configuration& Cnf)
+ /*}}}*/
+bool pkgVendorList::CreateList(Configuration& Cnf) /*{{{*/
{
for (vector<const Vendor *>::const_iterator I = VendorList.begin();
I != VendorList.end(); I++)
@@ -110,8 +110,8 @@ bool pkgVendorList::CreateList(Configuration& Cnf)
return !_error->PendingError();
}
-
-const Vendor* pkgVendorList::LookupFingerprint(string Fingerprint)
+ /*}}}*/
+const Vendor* pkgVendorList::LookupFingerprint(string Fingerprint) /*{{{*/
{
for (const_iterator I = VendorList.begin(); I != VendorList.end(); ++I)
{
@@ -121,8 +121,8 @@ const Vendor* pkgVendorList::LookupFingerprint(string Fingerprint)
return NULL;
}
-
-const Vendor* pkgVendorList::FindVendor(const std::vector<string> GPGVOutput)
+ /*}}}*/
+const Vendor* pkgVendorList::FindVendor(const std::vector<string> GPGVOutput) /*{{{*/
{
for (std::vector<string>::const_iterator I = GPGVOutput.begin(); I != GPGVOutput.end(); I++)
{
@@ -142,3 +142,4 @@ const Vendor* pkgVendorList::FindVendor(const std::vector<string> GPGVOutput)
return NULL;
}
+ /*}}}*/