diff options
| author | Michael Vogt <egon@debian-devbox> | 2011-10-14 13:55:50 +0200 |
|---|---|---|
| committer | Michael Vogt <egon@debian-devbox> | 2011-10-14 13:55:50 +0200 |
| commit | a1e68c33ac15be454984b00d62c7fc331bd0b32b (patch) | |
| tree | abf59def54f9df6bbf9aa380b1314364482d8b1c /apt-inst/deb/debfile.cc | |
| parent | 7be8c02360bdb9bd7f59b087da874f88af2a7206 (diff) | |
| parent | 0e7c33134cd32410eb8b344c6b6577826238bbbc (diff) | |
merged lp:~donkult/apt/experimental
Diffstat (limited to 'apt-inst/deb/debfile.cc')
| -rw-r--r-- | apt-inst/deb/debfile.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/apt-inst/deb/debfile.cc b/apt-inst/deb/debfile.cc index e80d8c735..4bd065cf8 100644 --- a/apt-inst/deb/debfile.cc +++ b/apt-inst/deb/debfile.cc @@ -18,6 +18,7 @@ // 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> @@ -107,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) @@ -174,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); |