summaryrefslogtreecommitdiff
path: root/python/arfile.cc
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2011-11-10 17:20:58 +0100
committerMichael Vogt <michael.vogt@ubuntu.com>2011-11-10 17:20:58 +0100
commit628d7caf9ca6ee819398a4b88c23e42094fe2c10 (patch)
tree06d0c31214151eadd35a945dc6e063e2e52dd38d /python/arfile.cc
parent1948d5d03887eb81ea7797c0f23049ef6c3895ce (diff)
downloadpython-apt-628d7caf9ca6ee819398a4b88c23e42094fe2c10.tar.gz
fix build against apt in experimental
Diffstat (limited to 'python/arfile.cc')
-rw-r--r--python/arfile.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/python/arfile.cc b/python/arfile.cc
index c31ea35e..44cd3c82 100644
--- a/python/arfile.cc
+++ b/python/arfile.cc
@@ -204,7 +204,7 @@ static PyObject *_extract(FileFd &Fd, const ARArchive::Member *member,
if (!Fd.Seek(member->Start))
return HandleErrors();
- string outfile_str = flCombine(dir,member->Name);
+ std::string outfile_str = flCombine(dir,member->Name);
char *outfile = (char*)outfile_str.c_str();
// We are not using FileFd here, because we want to raise OSErrror with
@@ -539,8 +539,8 @@ static PyObject *debfile_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
for (std::vector<std::string>::const_iterator t = types.begin();
t != types.end(); ++t)
{
- string member = string("data.tar.").append(*t);
- string comp = _config->Find(string("Acquire::CompressionTypes::").append(*t));
+ std::string member = std::string("data.tar.").append(*t);
+ std::string comp = _config->Find(std::string("Acquire::CompressionTypes::").append(*t));
self->data = _gettar(self, self->Object->FindMember(member.c_str()),
comp.c_str());
if (self->data)
@@ -548,7 +548,7 @@ static PyObject *debfile_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
}
// no data found, we need to
if (!self->data) {
- string error;
+ std::string error;
for (std::vector<std::string>::const_iterator t = types.begin();
t != types.end(); ++t)
error.append(*t + ",");