merged from lp:~donkult/apt/sid

[apt.git] / apt-pkg / vendorlist.cc

diff --git a/apt-pkg/vendorlist.cc b/apt-pkg/vendorlist.cc
index 72694dd756c0a3564e14143861925b44ae0349cd..92ff3889448340688d14bc55f96f11194009eeaf 100644 (file)
--- a/apt-pkg/vendorlist.cc
+++ b/apt-pkg/vendorlist.cc
@@ -10,7 +10,7 @@ pkgVendorList::~pkgVendorList()
       delete *I;
 }
 
       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.
 // ---------------------------------------------------------------------
 /* This also scans a directory of vendor files similar to apt.conf.d 
    which can contain the usual suspects of distribution provided data.


@@ -21,18 +21,18 @@ bool pkgVendorList::ReadMainList()
    Configuration Cnf;
 
    string CnfFile = _config->FindDir("Dir::Etc::vendorparts");
    Configuration Cnf;
 
    string CnfFile = _config->FindDir("Dir::Etc::vendorparts");

-   if (FileExists(CnfFile) == true)
+   if (DirectoryExists(CnfFile) == true)

       if (ReadConfigDir(Cnf,CnfFile,true) == false)
         return false;
    CnfFile = _config->FindFile("Dir::Etc::vendorlist");
       if (ReadConfigDir(Cnf,CnfFile,true) == false)
         return false;
    CnfFile = _config->FindFile("Dir::Etc::vendorlist");

-   if (FileExists(CnfFile) == true)
+   if (RealFileExists(CnfFile) == true)

       if (ReadConfigFile(Cnf,CnfFile,true) == false)
         return false;
 
    return CreateList(Cnf);
 }
       if (ReadConfigFile(Cnf,CnfFile,true) == false)
         return false;
 
    return CreateList(Cnf);
 }

-
-bool pkgVendorList::Read(string File)
+                                                                       /*}}}*/
+bool pkgVendorList::Read(string File)                                  /*{{{*/

 {
    Configuration Cnf;
    if (ReadConfigFile(Cnf,File,true) == false)
 {
    Configuration Cnf;
    if (ReadConfigFile(Cnf,File,true) == false)


@@ -40,8 +40,8 @@ bool pkgVendorList::Read(string File)
 
    return CreateList(Cnf);
 }
 
    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++)
 {
    for (vector<const Vendor *>::const_iterator I = VendorList.begin(); 
        I != VendorList.end(); I++)


@@ -110,10 +110,10 @@ bool pkgVendorList::CreateList(Configuration& Cnf)
    
    return !_error->PendingError();
 }
    
    return !_error->PendingError();
 }

-
-const Vendor* pkgVendorList::LookupFingerprint(string Fingerprint)
+                                                                       /*}}}*/
+const Vendor* pkgVendorList::LookupFingerprint(string Fingerprint)     /*{{{*/

 {
 {

-   for (const_iterator I = begin(); I != end(); ++I)
+   for (const_iterator I = VendorList.begin(); I != VendorList.end(); ++I)

    {
       if ((*I)->LookupFingerprint(Fingerprint) != "")
          return *I;
    {
       if ((*I)->LookupFingerprint(Fingerprint) != "")
          return *I;


@@ -121,8 +121,8 @@ const Vendor* pkgVendorList::LookupFingerprint(string Fingerprint)
 
    return NULL;
 }
 
    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++)
    {
 {
    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;
 }
 
    return NULL;
 }

+                                                                       /*}}}*/