projects
/
apt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
implement generic config fallback for methods
[apt.git]
/
apt-pkg
/
versionmatch.h
diff --git
a/apt-pkg/versionmatch.h
b/apt-pkg/versionmatch.h
index a8da072ae078e039ce8dafd9004ec8183eca9fb7..156ad61cbf8ee1ce905a4110e1f67c3cf4757550 100644
(file)
--- a/
apt-pkg/versionmatch.h
+++ b/
apt-pkg/versionmatch.h
@@
-35,42
+35,48
@@
#ifndef PKGLIB_VERSIONMATCH_H
#define PKGLIB_VERSIONMATCH_H
#ifndef PKGLIB_VERSIONMATCH_H
#define PKGLIB_VERSIONMATCH_H
+#include <apt-pkg/pkgcache.h>
+#include <apt-pkg/cacheiterators.h>
#include <string>
#include <string>
-#include <apt-pkg/pkgcache.h>
+#ifndef APT_8_CLEANER_HEADERS
using std::string;
using std::string;
+#endif
class pkgVersionMatch
class pkgVersionMatch
-{
+{
// Version Matching
// Version Matching
- string VerStr;
+ st
d::st
ring VerStr;
bool VerPrefixMatch;
// Release Matching
bool VerPrefixMatch;
// Release Matching
- string RelVerStr;
+ st
d::st
ring RelVerStr;
bool RelVerPrefixMatch;
bool RelVerPrefixMatch;
- string RelOrigin;
- string RelRelease;
- string RelCodename;
- string RelArchive;
- string RelLabel;
- string RelComponent;
- string RelArchitecture;
+ st
d::st
ring RelOrigin;
+ st
d::st
ring RelRelease;
+ st
d::st
ring RelCodename;
+ st
d::st
ring RelArchive;
+ st
d::st
ring RelLabel;
+ st
d::st
ring RelComponent;
+ st
d::st
ring RelArchitecture;
bool MatchAll;
bool MatchAll;
-
+
// Origin Matching
// Origin Matching
- string OrSite;
-
+ st
d::st
ring OrSite;
+
public:
public:
-
+
enum MatchType {None = 0,Version,Release,Origin} Type;
enum MatchType {None = 0,Version,Release,Origin} Type;
-
- bool MatchVer(const char *A,string B,bool Prefix);
+
+ bool MatchVer(const char *A,std::string B,bool Prefix) APT_PURE;
+ static bool ExpressionMatches(const char *pattern, const char *string);
+ static bool ExpressionMatches(const std::string& pattern, const char *string);
bool FileMatch(pkgCache::PkgFileIterator File);
pkgCache::VerIterator Find(pkgCache::PkgIterator Pkg);
bool FileMatch(pkgCache::PkgFileIterator File);
pkgCache::VerIterator Find(pkgCache::PkgIterator Pkg);
-
- pkgVersionMatch(string Data,MatchType Type);
+ bool VersionMatches(pkgCache::VerIterator Ver);
+
+ pkgVersionMatch(std::string Data,MatchType Type);
};
#endif
};
#endif