diff options
| author | Jaywalker <jwilliams@nsllc.com> | 2018-02-06 23:51:41 -0600 |
|---|---|---|
| committer | Sam Bingner <sam@bingner.com> | 2019-12-26 15:10:36 -1000 |
| commit | 18876defc0a550f09b4ca64f331d804101396e65 (patch) | |
| tree | f5dd89730bcc3e93ad27e1a4c3603edb70bc58ba /apt-pkg/deb | |
| parent | 1b9f9625972ed004ad9bdd7b1d4ce7ee3f152d45 (diff) | |
Fixed system() using coolstar's patch and added other required patches
Diffstat (limited to 'apt-pkg/deb')
| -rw-r--r-- | apt-pkg/deb/deblistparser.h | 2 | ||||
| -rw-r--r-- | apt-pkg/deb/dpkgpm.cc | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/apt-pkg/deb/deblistparser.h b/apt-pkg/deb/deblistparser.h index f02252d58..4cde9f56f 100644 --- a/apt-pkg/deb/deblistparser.h +++ b/apt-pkg/deb/deblistparser.h @@ -52,6 +52,8 @@ class APT_HIDDEN debListParser : public pkgCacheListParser pkgTagSection Section; map_filesize_t iOffset; + std::string Arch; + virtual bool ParseStatus(pkgCache::PkgIterator &Pkg,pkgCache::VerIterator &Ver); bool ParseDepends(pkgCache::VerIterator &Ver, pkgTagSection::Key Key, unsigned int Type); diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index 3c707e220..f3ed0f3d6 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -1714,7 +1714,7 @@ bool pkgDPkgPM::Go(APT::Progress::PackageManager *progress) bool dpkgMultiArch = debSystem::SupportsMultiArch(); // start pty magic before the loop - StartPtyMagic(); + //StartPtyMagic(); or not... // Tell the progress that its starting and fork dpkg d->progress->Start(d->master); @@ -2134,7 +2134,7 @@ bool pkgDPkgPM::Go(APT::Progress::PackageManager *progress) } } // dpkg is done at this point - StopPtyMagic(); + //StopPtyMagic(); CloseLog(); if (d->dpkg_error.empty() == false) |