// -*- mode: cpp; mode: fold -*-
// Description /*{{{*/
-// $Id: sourcelist.cc,v 1.17 1999/10/17 07:30:23 jgg Exp $
+// $Id: sourcelist.cc,v 1.3 2002/08/15 20:51:37 niemeyer Exp $
/* ######################################################################
List of Sources
##################################################################### */
/*}}}*/
// Include Files /*{{{*/
-#ifdef __GNUG__
-#pragma implementation "apt-pkg/sourcelist.h"
-#endif
+#include<config.h>
#include <apt-pkg/sourcelist.h>
#include <apt-pkg/error.h>
#include <apt-pkg/fileutl.h>
-#include <apt-pkg/configuration.h>
#include <apt-pkg/strutl.h>
+#include <apt-pkg/configuration.h>
+#include <apt-pkg/metaindex.h>
+#include <apt-pkg/indexfile.h>
+#include <apt-pkg/tagfile.h>
+#include <apt-pkg/pkgcache.h>
+#include <apt-pkg/cacheiterators.h>
-#include <fstream.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <sys/stat.h>
+#include <ctype.h>
+#include <stddef.h>
+#include <time.h>
+#include <cstring>
+#include <map>
+#include <string>
+#include <vector>
+#include <fstream>
+#include <algorithm>
+
+#include <apti18n.h>
/*}}}*/
-// SourceList::pkgSourceList - Constructors /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-pkgSourceList::pkgSourceList()
-{
-}
+using namespace std;
-pkgSourceList::pkgSourceList(string File)
+// Global list of Items supported
+static pkgSourceList::Type *ItmList[10];
+pkgSourceList::Type **pkgSourceList::Type::GlobalList = ItmList;
+unsigned long pkgSourceList::Type::GlobalListLen = 0;
+
+// Type::Type - Constructor /*{{{*/
+// ---------------------------------------------------------------------
+/* Link this to the global list of items*/
+pkgSourceList::Type::Type() : Name(NULL), Label(NULL)
{
- Read(File);
+ ItmList[GlobalListLen] = this;
+ GlobalListLen++;
}
/*}}}*/
-// SourceList::ReadMainList - Read the main source list from etc /*{{{*/
+// Type::GetType - Get a specific meta for a given type /*{{{*/
// ---------------------------------------------------------------------
/* */
-bool pkgSourceList::ReadMainList()
+pkgSourceList::Type *pkgSourceList::Type::GetType(const char *Type)
{
- return Read(_config->FindFile("Dir::Etc::sourcelist"));
+ for (unsigned I = 0; I != GlobalListLen; I++)
+ if (strcmp(GlobalList[I]->Name,Type) == 0)
+ return GlobalList[I];
+ return 0;
}
/*}}}*/
-// SourceList::Read - Parse the sourcelist file /*{{{*/
+// Type::FixupURI - Normalize the URI and check it.. /*{{{*/
// ---------------------------------------------------------------------
/* */
-bool pkgSourceList::Read(string File)
+bool pkgSourceList::Type::FixupURI(string &URI) const
{
- // Open the stream for reading
- ifstream F(File.c_str(),ios::in | ios::nocreate);
- if (!F != 0)
- return _error->Errno("ifstream::ifstream","Opening %s",File.c_str());
+ if (URI.empty() == true)
+ return false;
+
+ if (URI.find(':') == string::npos)
+ return false;
+
+ URI = SubstVar(URI,"$(ARCH)",_config->Find("APT::Architecture"));
- List.erase(List.begin(),List.end());
- char Buffer[300];
+ // Make sure that the URI is / postfixed
+ if (URI[URI.size() - 1] != '/')
+ URI += '/';
+
+ return true;
+}
+ /*}}}*/
+bool pkgSourceList::Type::ParseStanza(vector<metaIndex *> &List,
+ pkgTagSection &Tags,
+ int i,
+ FileFd &Fd)
+{
+ map<string, string> Options;
- int CurLine = 0;
- while (F.eof() == false)
+ string Enabled = Tags.FindS("Enabled");
+ if (Enabled.size() > 0 && StringToBool(Enabled) == false)
+ return true;
+
+ // Define external/internal options
+ const char* option_deb822[] = {
+ "Architectures", "Architectures-Add", "Architectures-Remove", "Trusted",
+ };
+ const char* option_internal[] = {
+ "arch", "arch+", "arch-", "trusted",
+ };
+ for (unsigned int j=0; j < sizeof(option_deb822)/sizeof(char*); j++)
+ if (Tags.Exists(option_deb822[j]))
+ {
+ // for deb822 the " " is the delimiter, but the backend expects ","
+ std::string option = Tags.FindS(option_deb822[j]);
+ std::replace(option.begin(), option.end(), ' ', ',');
+ Options[option_internal[j]] = option;
+ }
+
+ // now create one item per suite/section
+ string Suite = Tags.FindS("Suites");
+ Suite = SubstVar(Suite,"$(ARCH)",_config->Find("APT::Architecture"));
+ string const Section = Tags.FindS("Sections");
+ string URIS = Tags.FindS("URIs");
+
+ std::vector<std::string> list_uris = StringSplit(URIS, " ");
+ std::vector<std::string> list_dist = StringSplit(Suite, " ");
+ std::vector<std::string> list_section = StringSplit(Section, " ");
+
+ for (std::vector<std::string>::const_iterator U = list_uris.begin();
+ U != list_uris.end(); U++)
{
- F.getline(Buffer,sizeof(Buffer));
- CurLine++;
- _strtabexpand(Buffer,sizeof(Buffer));
- _strstrip(Buffer);
-
- // Comment or blank
- if (Buffer[0] == '#' || Buffer[0] == 0)
- continue;
-
- // Grok it
- string Type;
- string URI;
- Item Itm;
- const char *C = Buffer;
- if (ParseQuoteWord(C,Type) == false)
- return _error->Error("Malformed line %u in source list %s (type)",CurLine,File.c_str());
- if (ParseQuoteWord(C,URI) == false)
- return _error->Error("Malformed line %u in source list %s (URI)",CurLine,File.c_str());
- if (ParseQuoteWord(C,Itm.Dist) == false)
- return _error->Error("Malformed line %u in source list %s (dist)",CurLine,File.c_str());
- if (Itm.SetType(Type) == false)
- return _error->Error("Malformed line %u in source list %s (type parse)",CurLine,File.c_str());
- if (Itm.SetURI(URI) == false)
- return _error->Error("Malformed line %u in source list %s (URI parse)",CurLine,File.c_str());
-
- // Check for an absolute dists specification.
- if (Itm.Dist.empty() == false && Itm.Dist[Itm.Dist.size() - 1] == '/')
+ std::string URI = (*U);
+ if (!FixupURI(URI))
{
- if (ParseQuoteWord(C,Itm.Section) == true)
- return _error->Error("Malformed line %u in source list %s (Absolute dist)",CurLine,File.c_str());
- Itm.Dist = SubstVar(Itm.Dist,"$(ARCH)",_config->Find("APT::Architecture"));
- List.push_back(Itm);
- continue;
+ _error->Error(_("Malformed stanza %u in source list %s (URI parse)"),i,Fd.Name().c_str());
+ return false;
}
- // Grab the rest of the dists
- if (ParseQuoteWord(C,Itm.Section) == false)
- return _error->Error("Malformed line %u in source list %s (dist parse)",CurLine,File.c_str());
-
- do
+ for (std::vector<std::string>::const_iterator I = list_dist.begin();
+ I != list_dist.end(); I++)
{
- List.push_back(Itm);
+ for (std::vector<std::string>::const_iterator J = list_section.begin();
+ J != list_section.end(); J++)
+ {
+ if (CreateItem(List, URI, (*I), (*J), Options) == false)
+ {
+ return false;
+ }
+ }
}
- while (ParseQuoteWord(C,Itm.Section) == true);
}
return true;
}
- /*}}}*/
-// SourceList::Item << - Writes the item to a stream /*{{{*/
-// ---------------------------------------------------------------------
-/* This is not suitable for rebuilding the sourcelist file but it good for
- debugging. */
-ostream &operator <<(ostream &O,pkgSourceList::Item &Itm)
-{
- O << (int)Itm.Type << ' ' << Itm.URI << ' ' << Itm.Dist << ' ' << Itm.Section;
- return O;
-}
- /*}}}*/
-// SourceList::Item::SetType - Sets the distribution type /*{{{*/
+
+// Type::ParseLine - Parse a single line /*{{{*/
// ---------------------------------------------------------------------
-/* */
-bool pkgSourceList::Item::SetType(string S)
+/* This is a generic one that is the 'usual' format for sources.list
+ Weird types may override this. */
+bool pkgSourceList::Type::ParseLine(vector<metaIndex *> &List,
+ const char *Buffer,
+ unsigned long const &CurLine,
+ string const &File) const
{
- if (S == "deb")
+ for (;Buffer != 0 && isspace(*Buffer); ++Buffer); // Skip whitespaces
+
+ // Parse option field if it exists
+ // e.g.: [ option1=value1 option2=value2 ]
+ map<string, string> Options;
+ if (Buffer != 0 && Buffer[0] == '[')
{
- Type = Deb;
- return true;
+ ++Buffer; // ignore the [
+ for (;Buffer != 0 && isspace(*Buffer); ++Buffer); // Skip whitespaces
+ while (*Buffer != ']')
+ {
+ // get one option, e.g. option1=value1
+ string option;
+ if (ParseQuoteWord(Buffer,option) == false)
+ return _error->Error(_("Malformed line %lu in source list %s ([option] unparseable)"),CurLine,File.c_str());
+
+ if (option.length() < 3)
+ return _error->Error(_("Malformed line %lu in source list %s ([option] too short)"),CurLine,File.c_str());
+
+ // accept options even if the last has no space before the ]-end marker
+ if (option.at(option.length()-1) == ']')
+ {
+ for (; *Buffer != ']'; --Buffer);
+ option.resize(option.length()-1);
+ }
+
+ size_t const needle = option.find('=');
+ if (needle == string::npos)
+ return _error->Error(_("Malformed line %lu in source list %s ([%s] is not an assignment)"),CurLine,File.c_str(), option.c_str());
+
+ string const key = string(option, 0, needle);
+ string const value = string(option, needle + 1, option.length());
+
+ if (key.empty() == true)
+ return _error->Error(_("Malformed line %lu in source list %s ([%s] has no key)"),CurLine,File.c_str(), option.c_str());
+
+ if (value.empty() == true)
+ return _error->Error(_("Malformed line %lu in source list %s ([%s] key %s has no value)"),CurLine,File.c_str(),option.c_str(),key.c_str());
+
+ Options[key] = value;
+ }
+ ++Buffer; // ignore the ]
+ for (;Buffer != 0 && isspace(*Buffer); ++Buffer); // Skip whitespaces
}
- if (S == "deb-src")
+ string URI;
+ string Dist;
+ string Section;
+
+ if (ParseQuoteWord(Buffer,URI) == false)
+ return _error->Error(_("Malformed line %lu in source list %s (URI)"),CurLine,File.c_str());
+ if (ParseQuoteWord(Buffer,Dist) == false)
+ return _error->Error(_("Malformed line %lu in source list %s (dist)"),CurLine,File.c_str());
+
+ if (FixupURI(URI) == false)
+ return _error->Error(_("Malformed line %lu in source list %s (URI parse)"),CurLine,File.c_str());
+
+ // Check for an absolute dists specification.
+ if (Dist.empty() == false && Dist[Dist.size() - 1] == '/')
{
- Type = DebSrc;
- return true;
+ if (ParseQuoteWord(Buffer,Section) == true)
+ return _error->Error(_("Malformed line %lu in source list %s (absolute dist)"),CurLine,File.c_str());
+ Dist = SubstVar(Dist,"$(ARCH)",_config->Find("APT::Architecture"));
+ return CreateItem(List, URI, Dist, Section, Options);
}
-
- return false;
+
+ // Grab the rest of the dists
+ if (ParseQuoteWord(Buffer,Section) == false)
+ return _error->Error(_("Malformed line %lu in source list %s (dist parse)"),CurLine,File.c_str());
+
+ do
+ {
+ if (CreateItem(List, URI, Dist, Section, Options) == false)
+ return false;
+ }
+ while (ParseQuoteWord(Buffer,Section) == true);
+
+ return true;
}
/*}}}*/
-// SourceList::Item::SetURI - Set the URI /*{{{*/
+// SourceList::pkgSourceList - Constructors /*{{{*/
// ---------------------------------------------------------------------
-/* For simplicity we strip the scheme off the uri */
-bool pkgSourceList::Item::SetURI(string S)
+/* */
+pkgSourceList::pkgSourceList()
{
- if (S.empty() == true)
- return false;
+}
- if (S.find(':') == string::npos)
+pkgSourceList::pkgSourceList(string File)
+{
+ Read(File);
+}
+ /*}}}*/
+// SourceList::~pkgSourceList - Destructor /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+pkgSourceList::~pkgSourceList()
+{
+ for (const_iterator I = SrcList.begin(); I != SrcList.end(); ++I)
+ delete *I;
+}
+ /*}}}*/
+// SourceList::ReadMainList - Read the main source list from etc /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+bool pkgSourceList::ReadMainList()
+{
+ // CNC:2003-03-03 - Multiple sources list support.
+ bool Res = true;
+#if 0
+ Res = ReadVendors();
+ if (Res == false)
return false;
+#endif
- S = SubstVar(S,"$(ARCH)",_config->Find("APT::Architecture"));
-
- // Make sure that the URN is / postfixed
- URI = S;
- if (URI[URI.size() - 1] != '/')
- URI += '/';
+ Reset();
+ // CNC:2003-11-28 - Entries in sources.list have priority over
+ // entries in sources.list.d.
+ string Main = _config->FindFile("Dir::Etc::sourcelist");
+ string Parts = _config->FindDir("Dir::Etc::sourceparts");
- return true;
+ if (RealFileExists(Main) == true)
+ Res &= ReadAppend(Main);
+ else if (DirectoryExists(Parts) == false)
+ // Only warn if there are no sources.list.d.
+ _error->WarningE("DirectoryExists", _("Unable to read %s"), Parts.c_str());
+
+ if (DirectoryExists(Parts) == true)
+ Res &= ReadSourceDir(Parts);
+ else if (RealFileExists(Main) == false)
+ // Only warn if there is no sources.list file.
+ _error->WarningE("RealFileExists", _("Unable to read %s"), Main.c_str());
+
+ return Res;
}
/*}}}*/
-// SourceList::Item::PackagesURI - Returns a URI to the packages file /*{{{*/
+// SourceList::Reset - Clear the sourcelist contents /*{{{*/
// ---------------------------------------------------------------------
/* */
-string pkgSourceList::Item::PackagesURI() const
+void pkgSourceList::Reset()
{
- string Res;
- switch (Type)
- {
- case Deb:
- if (Dist[Dist.size() - 1] == '/')
- {
- if (Dist != "/")
- Res = URI + Dist;
- else
- Res = URI;
- }
- else
- Res = URI + "dists/" + Dist + '/' + Section +
- "/binary-" + _config->Find("APT::Architecture") + '/';
-
- Res += "Packages";
- break;
-
- case DebSrc:
- if (Dist[Dist.size() - 1] == '/')
- Res = URI + Dist;
- else
- Res = URI + "dists/" + Dist + '/' + Section +
- "/source/";
-
- Res += "Sources";
- break;
- };
- return Res;
+ for (const_iterator I = SrcList.begin(); I != SrcList.end(); ++I)
+ delete *I;
+ SrcList.erase(SrcList.begin(),SrcList.end());
+}
+ /*}}}*/
+// SourceList::Read - Parse the sourcelist file /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+bool pkgSourceList::Read(string File)
+{
+ Reset();
+ return ReadAppend(File);
}
/*}}}*/
-// SourceList::Item::PackagesInfo - Shorter version of the URI /*{{{*/
+// SourceList::ReadAppend - Parse a sourcelist file /*{{{*/
// ---------------------------------------------------------------------
-/* This is a shorter version that is designed to be < 60 chars or so */
-string pkgSourceList::Item::PackagesInfo() const
+/* */
+bool pkgSourceList::ReadAppend(string File)
{
- string Res;
- switch (Type)
+ if (_config->FindB("APT::Sources::Use-Deb822", false) == true)
{
- case Deb:
- Res += SiteOnly(URI) + ' ';
- if (Dist[Dist.size() - 1] == '/')
- {
- if (Dist != "/")
- Res += Dist;
- }
- else
- Res += Dist + '/' + Section;
-
- Res += " Packages";
- break;
-
- case DebSrc:
- Res += SiteOnly(URI) + ' ';
- if (Dist[Dist.size() - 1] == '/')
- Res += Dist;
- else
- Res += Dist + '/' + Section;
-
- Res += " Sources";
- break;
- };
- return Res;
+ int lines_parsed =ParseFileDeb822(File);
+ if (lines_parsed < 0)
+ return false;
+ else if (lines_parsed > 0)
+ return true;
+ // no lines parsed ... fall through and use old style parser
+ }
+ return ParseFileOldStyle(File);
}
- /*}}}*/
-// SourceList::Item::ReleaseURI - Returns a URI to the release file /*{{{*/
+
+// SourceList::ReadFileOldStyle - Read Traditional style sources.list /*{{{*/
// ---------------------------------------------------------------------
/* */
-string pkgSourceList::Item::ReleaseURI() const
+bool pkgSourceList::ParseFileOldStyle(string File)
{
- string Res;
- switch (Type)
+ // Open the stream for reading
+ ifstream F(File.c_str(),ios::in /*| ios::nocreate*/);
+ if (!F != 0)
+ return _error->Errno("ifstream::ifstream",_("Opening %s"),File.c_str());
+
+ // CNC:2003-12-10 - 300 is too short.
+ char Buffer[1024];
+
+ int CurLine = 0;
+ while (F.eof() == false)
{
- case Deb:
- if (Dist[Dist.size() - 1] == '/')
- {
- if (Dist != "/")
- Res = URI + Dist;
- else
- Res = URI;
- }
- else
- Res = URI + "dists/" + Dist + '/' + Section +
- "/binary-" + _config->Find("APT::Architecture") + '/';
+ F.getline(Buffer,sizeof(Buffer));
+ CurLine++;
+ _strtabexpand(Buffer,sizeof(Buffer));
+ if (F.fail() && !F.eof())
+ return _error->Error(_("Line %u too long in source list %s."),
+ CurLine,File.c_str());
+
- Res += "Release";
- break;
+ char *I;
+ // CNC:2003-02-20 - Do not break if '#' is inside [].
+ for (I = Buffer; *I != 0 && *I != '#'; I++)
+ if (*I == '[')
+ {
+ char *b_end = strchr(I + 1, ']');
+ if (b_end != NULL)
+ I = b_end;
+ }
+ *I = 0;
- case DebSrc:
- if (Dist[Dist.size() - 1] == '/')
- Res = URI + Dist;
- else
- Res = URI + "dists/" + Dist + '/' + Section +
- "/source/";
+ const char *C = _strstrip(Buffer);
- Res += "Release";
- break;
- };
- return Res;
+ // Comment or blank
+ if (C[0] == '#' || C[0] == 0)
+ continue;
+
+ // Grok it
+ string LineType;
+ if (ParseQuoteWord(C,LineType) == false)
+ return _error->Error(_("Malformed line %u in source list %s (type)"),CurLine,File.c_str());
+
+ Type *Parse = Type::GetType(LineType.c_str());
+ if (Parse == 0)
+ return _error->Error(_("Type '%s' is not known on line %u in source list %s"),LineType.c_str(),CurLine,File.c_str());
+
+ if (Parse->ParseLine(SrcList, C, CurLine, File) == false)
+ return false;
+ }
+ return true;
}
/*}}}*/
-// SourceList::Item::ReleaseInfo - Shorter version of the URI /*{{{*/
+// SourceList::ParseFileDeb822 - Parse deb822 style sources.list /*{{{*/
// ---------------------------------------------------------------------
-/* This is a shorter version that is designed to be < 60 chars or so */
-string pkgSourceList::Item::ReleaseInfo() const
+/* Returns: the number of stanzas parsed*/
+int pkgSourceList::ParseFileDeb822(string File)
{
- string Res;
- switch (Type)
+ pkgTagSection Tags;
+ unsigned int i=0;
+
+ // see if we can read the file
+ _error->PushToStack();
+ FileFd Fd(File, FileFd::ReadOnly);
+ pkgTagFile Sources(&Fd);
+ if (_error->PendingError() == true)
+ {
+ _error->RevertToStack();
+ return 0;
+ }
+ _error->MergeWithStack();
+
+ // read step by step
+ while (Sources.Step(Tags) == true)
{
- case Deb:
- case DebSrc:
- Res += SiteOnly(URI) + ' ';
- if (Dist[Dist.size() - 1] == '/')
+ if(!Tags.Exists("Types"))
+ continue;
+
+ string const types = Tags.FindS("Types");
+ std::vector<std::string> list_types = StringSplit(types, " ");
+ for (std::vector<std::string>::const_iterator I = list_types.begin();
+ I != list_types.end(); I++)
{
- if (Dist != "/")
- Res += Dist;
- }
- else
- Res += Dist + '/' + Section;
-
- Res += " Release";
- break;
- };
- return Res;
+ Type *Parse = Type::GetType((*I).c_str());
+ if (Parse == 0)
+ {
+ _error->Error(_("Type '%s' is not known on stanza %u in source list %s"), (*I).c_str(),i,Fd.Name().c_str());
+ return -1;
+ }
+
+ if (!Parse->ParseStanza(SrcList, Tags, i, Fd))
+ return -1;
+
+ i++;
+ }
+ }
+
+ // we are done, return the number of stanzas read
+ return i;
}
/*}}}*/
-// SourceList::Item::ArchiveInfo - Shorter version of the archive spec /*{{{*/
+// SourceList::FindIndex - Get the index associated with a file /*{{{*/
// ---------------------------------------------------------------------
-/* This is a shorter version that is designed to be < 60 chars or so */
-string pkgSourceList::Item::ArchiveInfo(pkgCache::VerIterator Ver) const
+/* */
+bool pkgSourceList::FindIndex(pkgCache::PkgFileIterator File,
+ pkgIndexFile *&Found) const
{
- string Res;
- switch (Type)
+ for (const_iterator I = SrcList.begin(); I != SrcList.end(); ++I)
{
- case DebSrc:
- case Deb:
- Res += SiteOnly(URI) + ' ';
- if (Dist[Dist.size() - 1] == '/')
+ vector<pkgIndexFile *> *Indexes = (*I)->GetIndexFiles();
+ for (vector<pkgIndexFile *>::const_iterator J = Indexes->begin();
+ J != Indexes->end(); ++J)
{
- if (Dist != "/")
- Res += Dist;
- }
- else
- Res += Dist + '/' + Section;
-
- Res += " ";
- Res += Ver.ParentPkg().Name();
- Res += " ";
- Res += Ver.VerStr();
-
- break;
- };
- return Res;
+ if ((*J)->FindInCache(*File.Cache()) == File)
+ {
+ Found = (*J);
+ return true;
+ }
+ }
+ }
+
+ return false;
}
/*}}}*/
-// SourceList::Item::ArchiveURI - Returns a URI to the given archive /*{{{*/
+// SourceList::GetIndexes - Load the index files into the downloader /*{{{*/
// ---------------------------------------------------------------------
/* */
-string pkgSourceList::Item::ArchiveURI(string File) const
+bool pkgSourceList::GetIndexes(pkgAcquire *Owner, bool GetAll) const
{
- string Res;
- switch (Type)
- {
- case Deb:
- case DebSrc:
- Res = URI + File;
- break;
- };
- return Res;
+ for (const_iterator I = SrcList.begin(); I != SrcList.end(); ++I)
+ if ((*I)->GetIndexes(Owner,GetAll) == false)
+ return false;
+ return true;
}
/*}}}*/
-// SourceList::Item::SourceInfo - Returns an info line for a source /*{{{*/
+// CNC:2003-03-03 - By Anton V. Denisov <avd@altlinux.org>.
+// SourceList::ReadSourceDir - Read a directory with sources files
+// Based on ReadConfigDir() /*{{{*/
// ---------------------------------------------------------------------
/* */
-string pkgSourceList::Item::SourceInfo(string Pkg,string Ver,string Comp) const
+bool pkgSourceList::ReadSourceDir(string Dir)
{
- string Res;
- switch (Type)
- {
- case DebSrc:
- case Deb:
- Res += SiteOnly(URI) + ' ';
- if (Dist[Dist.size() - 1] == '/')
- {
- if (Dist != "/")
- Res += Dist;
- }
- else
- Res += Dist + '/' + Section;
-
- Res += " ";
- Res += Pkg;
- Res += " ";
- Res += Ver;
- if (Comp.empty() == false)
- Res += " (" + Comp + ")";
- break;
- };
- return Res;
+ vector<string> const List = GetListOfFilesInDir(Dir, "list", true);
+
+ // Read the files
+ for (vector<string>::const_iterator I = List.begin(); I != List.end(); ++I)
+ if (ReadAppend(*I) == false)
+ return false;
+ return true;
+
}
/*}}}*/
-// SourceList::Item::SiteOnly - Strip off the path part of a URI /*{{{*/
+// GetLastModified() /*{{{*/
// ---------------------------------------------------------------------
/* */
-string pkgSourceList::Item::SiteOnly(string URI) const
+time_t pkgSourceList::GetLastModifiedTime()
{
- ::URI U(URI);
- U.User = string();
- U.Password = string();
- U.Path = string();
- U.Port = 0;
- return U;
+ vector<string> List;
+
+ string Main = _config->FindFile("Dir::Etc::sourcelist");
+ string Parts = _config->FindDir("Dir::Etc::sourceparts");
+
+ // go over the parts
+ if (DirectoryExists(Parts) == true)
+ List = GetListOfFilesInDir(Parts, "list", true);
+
+ // calculate the time
+ time_t mtime_sources = GetModificationTime(Main);
+ for (vector<string>::const_iterator I = List.begin(); I != List.end(); ++I)
+ mtime_sources = std::max(mtime_sources, GetModificationTime(*I));
+
+ return mtime_sources;
}
/*}}}*/
+
projects / apt.git / blobdiff