HCoop
/
ntk
/
apt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
apt-key del: Ignore case when checking if a keyid exists in a keyring.
[ntk/apt.git]
/
apt-pkg
/
vendor.cc
diff --git
a/apt-pkg/vendor.cc
b/apt-pkg/vendor.cc
index
2350afe
..
d4add56
100644
(file)
--- a/
apt-pkg/vendor.cc
+++ b/
apt-pkg/vendor.cc
@@
-1,8
+1,14
@@
-#include
<iostream
>
-#include <apt-pkg/error.h>
+#include
<config.h
>
+
#include <apt-pkg/vendor.h>
#include <apt-pkg/configuration.h>
#include <apt-pkg/vendor.h>
#include <apt-pkg/configuration.h>
+#include <iostream>
+#include <map>
+#include <string>
+#include <utility>
+#include <vector>
+
Vendor::Vendor(std::string VendorID,
std::string Origin,
std::vector<struct Vendor::Fingerprint *> *FingerprintList)
Vendor::Vendor(std::string VendorID,
std::string Origin,
std::vector<struct Vendor::Fingerprint *> *FingerprintList)
@@
-10,7
+16,7
@@
Vendor::Vendor(std::string VendorID,
this->VendorID = VendorID;
this->Origin = Origin;
for (std::vector<struct Vendor::Fingerprint *>::iterator I = FingerprintList->begin();
this->VendorID = VendorID;
this->Origin = Origin;
for (std::vector<struct Vendor::Fingerprint *>::iterator I = FingerprintList->begin();
- I != FingerprintList->end();
I++
)
+ I != FingerprintList->end();
++I
)
{
if (_config->FindB("Debug::Vendor", false))
std::cerr << "Vendor \"" << VendorID << "\": Mapping \""
{
if (_config->FindB("Debug::Vendor", false))
std::cerr << "Vendor \"" << VendorID << "\": Mapping \""
@@
-20,16
+26,16
@@
Vendor::Vendor(std::string VendorID,
delete FingerprintList;
}
delete FingerprintList;
}
-const st
ring Vendor::LookupFingerprint(
string Print) const
+const st
d::string Vendor::LookupFingerprint(std::
string Print) const
{
{
- std::map<st
ring,
string>::const_iterator Elt = Fingerprints.find(Print);
+ std::map<st
d::string,std::
string>::const_iterator Elt = Fingerprints.find(Print);
if (Elt == Fingerprints.end())
return "";
else
return (*Elt).second;
}
if (Elt == Fingerprints.end())
return "";
else
return (*Elt).second;
}
-
bool Vendor::CheckDist(string Dist
)
+
APT_CONST bool Vendor::CheckDist(std::string /*Dist*/
)
{
return true;
}
{
return true;
}