diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2011-11-10 16:56:21 +0100 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2011-11-10 16:56:21 +0100 |
| commit | 7cb543fb742a837c4931513674febaec5e4c1401 (patch) | |
| tree | ddefe5b9329907818aa6eb3b593f555b29ccb869 /apt-inst/deb/debfile.cc | |
| parent | f6cb0880a4b5d31e398cceb2e2577b6b82f4fffb (diff) | |
| parent | 71ecaad29d8066a494f516efc5efd80860653fe2 (diff) | |
merged from lp:~mvo/apt/mvo (that has all the changes from debian-experimental2) and resolved a bunch of conflicts
Diffstat (limited to 'apt-inst/deb/debfile.cc')
| -rw-r--r-- | apt-inst/deb/debfile.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/apt-inst/deb/debfile.cc b/apt-inst/deb/debfile.cc index a40cd1ae8..4bd065cf8 100644 --- a/apt-inst/deb/debfile.cc +++ b/apt-inst/deb/debfile.cc @@ -16,6 +16,9 @@ ##################################################################### */ /*}}}*/ // Include Files /*{{{*/ +#include<config.h> + +#include <apt-pkg/database.h> #include <apt-pkg/debfile.h> #include <apt-pkg/extracttar.h> #include <apt-pkg/error.h> @@ -105,8 +108,8 @@ bool debDebFile::ExtractControl(pkgDataBase &DB) return false; // Get into the temporary directory - string Cwd = SafeGetCWD(); - string Tmp; + std::string Cwd = SafeGetCWD(); + std::string Tmp; if (DB.GetMetaTmp(Tmp) == false) return false; if (chdir(Tmp.c_str()) != 0) @@ -172,7 +175,7 @@ bool debDebFile::ExtractArchive(pkgDirStream &Stream) pkgCache::VerIterator debDebFile::MergeControl(pkgDataBase &DB) { // Open the control file - string Tmp; + std::string Tmp; if (DB.GetMetaTmp(Tmp) == false) return pkgCache::VerIterator(DB.GetCache()); FileFd Fd(Tmp + "control",FileFd::ReadOnly); |