summaryrefslogtreecommitdiff
path: root/apt-pkg/sourcelist.h
diff options
context:
space:
mode:
authorMichael Vogt <mvo@debian.org>2015-08-18 11:57:35 +0200
committerMichael Vogt <mvo@debian.org>2015-08-18 11:57:35 +0200
commitb53c9cea2902572822bbbece5bac236c1bbf846e (patch)
tree6c6b0524e0971c0623ccbff71383523ee0b2a5cc /apt-pkg/sourcelist.h
parent21248c0f00ee71412dbadc6ebf84011cf974346d (diff)
parent2a22cd60f04c4291ea9b9b72e15b6d2ec378b001 (diff)
Merge remote-tracking branch 'upstream/debian/experimental' into feature/srv-records
Diffstat (limited to 'apt-pkg/sourcelist.h')
-rw-r--r--apt-pkg/sourcelist.h51
1 files changed, 33 insertions, 18 deletions
diff --git a/apt-pkg/sourcelist.h b/apt-pkg/sourcelist.h
index 998357509..47a562d18 100644
--- a/apt-pkg/sourcelist.h
+++ b/apt-pkg/sourcelist.h
@@ -1,6 +1,5 @@
// -*- mode: cpp; mode: fold -*-
// Description /*{{{*/
-// $Id: sourcelist.h,v 1.12.2.1 2003/12/24 23:09:17 mdz Exp $
/* ######################################################################
SourceList - Manage a list of sources
@@ -18,10 +17,6 @@
list all you have is a list of package index files that have the ability
to be Acquired.
- The vendor machanism is similar, except the vendor types are hard
- wired. Before loading the source list the vendor list is loaded.
- This doesn't load key data, just the checks to perform.
-
##################################################################### */
/*}}}*/
#ifndef PKGLIB_SOURCELIST_H
@@ -54,6 +49,8 @@ class metaIndex;
class pkgSourceList
{
+ void * const d;
+ std::vector<pkgIndexFile*> VolatileFiles;
public:
// List of supported source list types
@@ -66,22 +63,22 @@ class pkgSourceList
static unsigned long GlobalListLen;
static Type *GetType(const char *Type) APT_PURE;
- const char *Name;
- const char *Label;
+ char const * const Name;
+ char const * const Label;
bool FixupURI(std::string &URI) const;
virtual bool ParseStanza(std::vector<metaIndex *> &List,
pkgTagSection &Tags,
- int stanza_n,
+ unsigned int const stanza_n,
FileFd &Fd);
virtual bool ParseLine(std::vector<metaIndex *> &List,
const char *Buffer,
- unsigned long const &CurLine,std::string const &File) const;
+ unsigned int const CurLine,std::string const &File) const;
virtual bool CreateItem(std::vector<metaIndex *> &List,std::string const &URI,
std::string const &Dist,std::string const &Section,
std::map<std::string, std::string> const &Options) const = 0;
- Type();
- virtual ~Type() {};
+ Type(char const * const Name, char const * const Label);
+ virtual ~Type();
};
typedef std::vector<metaIndex *>::const_iterator const_iterator;
@@ -90,18 +87,19 @@ class pkgSourceList
std::vector<metaIndex *> SrcList;
- int ParseFileDeb822(std::string File);
- bool ParseFileOldStyle(std::string File);
+ private:
+ APT_HIDDEN bool ParseFileDeb822(std::string const &File);
+ APT_HIDDEN bool ParseFileOldStyle(std::string const &File);
public:
bool ReadMainList();
- bool Read(std::string File);
+ bool Read(std::string const &File);
// CNC:2003-03-03
void Reset();
- bool ReadAppend(std::string File);
- bool ReadSourceDir(std::string Dir);
+ bool ReadAppend(std::string const &File);
+ bool ReadSourceDir(std::string const &Dir);
// List accessors
inline const_iterator begin() const {return SrcList.begin();};
@@ -116,9 +114,26 @@ class pkgSourceList
// query last-modified time
time_t GetLastModifiedTime();
+ /** \brief add file for parsing, but not to the cache
+ *
+ * pkgIndexFiles origining from pkgSourcesList are included in
+ * srcpkgcache, the status files added via #AddStatusFiles are
+ * included in pkgcache, but these files here are not included in
+ * any cache to have the possibility of having a file included just
+ * for a single run like a local .deb/.dsc file.
+ *
+ * The volatile files do not count as "normal" sourceslist entries,
+ * can't be iterated over with #begin and #end and can't be
+ * downloaded, but they can be found via #FindIndex.
+ *
+ * @param File is an index file; pointer-ownership is transferred
+ */
+ void AddVolatileFile(pkgIndexFile * const File);
+ /** @return list of files registered with #AddVolatileFile */
+ std::vector<pkgIndexFile*> GetVolatileFiles() const;
+
pkgSourceList();
- pkgSourceList(std::string File);
- ~pkgSourceList();
+ virtual ~pkgSourceList();
};
#endif