From: Arch Librarian <arch@canonical.com>
Date: Mon, 20 Sep 2004 16:58:54 +0000 (+0000)
Subject: Added wakko{jgg}~#cd work/ap
X-Git-Tag: 0.7.24ubuntu1~939
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/5ef5c64e446ef915aafb40904bd7f0df855d4325

Added wakko{jgg}~#cd work/ap
Author: jgg
Date: 2002-03-20 05:51:20 GMT
Added wakko{jgg}~#cd work/ap
---

diff --git a/apt-pkg/sourcelist.cc b/apt-pkg/sourcelist.cc
index 98acc6eb2..e624bbec8 100644
--- a/apt-pkg/sourcelist.cc
+++ b/apt-pkg/sourcelist.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: sourcelist.cc,v 1.20 2001/05/15 05:46:11 jgg Exp $
+// $Id: sourcelist.cc,v 1.21 2002/03/20 05:51:20 jgg Exp $
 /* ######################################################################
 
    List of Sources
@@ -171,6 +171,31 @@ bool pkgSourceList::ReadVendors()
       VendorList.push_back(Vendor);
    }
 
+   /* XXX Process 'group-key' type sections
+      This is currently faked out so that the vendors file format is
+      parsed but nothing is done with it except check for validity */
+   Top = Cnf.Tree("group-key");
+   for (Top = (Top == 0?0:Top->Child); Top != 0; Top = Top->Next)
+   {
+      Configuration Block(Top);
+      Vendor *Vendor;
+      
+      Vendor = new pkgSourceList::Vendor;
+      
+      Vendor->VendorID = Top->Tag;
+      Vendor->Description = Block.Find("Name");
+
+      if (Vendor->Description.empty() == true)
+      {
+         _error->Error(_("Vendor block %s is invalid"), 
+		       Vendor->VendorID.c_str());
+	 delete Vendor;
+	 continue;
+      }
+      
+      VendorList.push_back(Vendor);
+   }
+   
    return !_error->PendingError();
 }
 									/*}}}*/