summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArch Librarian <arch@canonical.com>2004-09-20 16:58:54 +0000
committerArch Librarian <arch@canonical.com>2004-09-20 16:58:54 +0000
commit5ef5c64e446ef915aafb40904bd7f0df855d4325 (patch)
tree882c39a2d0eb911c73851de86430d3cbb9bfba1f
parent4fe6e0c27fd1ec5b4217012616efad6db3fe8b36 (diff)
Added wakko{jgg}~#cd work/ap
Author: jgg Date: 2002-03-20 05:51:20 GMT Added wakko{jgg}~#cd work/ap
-rw-r--r--apt-pkg/sourcelist.cc27
1 files changed, 26 insertions, 1 deletions
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();
}
/*}}}*/