← Back to branch summary

~ubuntu-branches/debian/experimental/apt/experimental

« back to all changes in this revision

Viewing changes to apt-pkg/deb/dpkgpm.cc

  • Committer: Package Import Robot
  • Author(s): Michael Vogt, Colin Watson, Michael Vogt
  • Date: 2013-11-29 20:50:17 UTC
  • mto: This revision was merged to the branch mainline in revision 50.
  • Revision ID: package-import@ubuntu.com-20131129205017-xzvq5coc1tv4u8vd
Tags: 0.9.13.1
http://bugs.debian.org/720597
http://bugs.debian.org/730490
https://launchpad.net/bugs/1255806
http://bugs.debian.org/709560
http://bugs.debian.org/730795
https://launchpad.net/bugs/1254499
[ Colin Watson ]
* fix "apt-get  --purge build-dep" (closes: #720597)
* fix regression that APT::Keep-Fds is not honored (closes: #730490)

[ Michael Vogt ]
* add "-f" option to "build-dep" as sbuild is using it to fix 
  regression with cross-building (LP: #1255806)
* add autopkgtest support for the integration testsuite
* merge mvo/feature/short-list
* merge mvo/feature/edit-sources
* fix segfault in pkgDepCache::SetCandidateRelease() (closes: #709560)
* reset terminal on error (closes: #730795)
* fix apport report writing (LP: #1254499)

Show diffs side-by-side

added added

removed removed

Lines of Context:
apt-pkg/deb/dpkgpm.cc
201
201
// ---------------------------------------------------------------------
202
202
/* */
203
203
pkgDPkgPM::pkgDPkgPM(pkgDepCache *Cache) 
204
 
   : pkgPackageManager(Cache), PackagesDone(0), PackagesTotal(0)
 
204
   : pkgPackageManager(Cache), pkgFailures(0), PackagesDone(0), PackagesTotal(0)
205
205
{
206
206
   d = new pkgDPkgPMPrivate();
207
207
}
417
417
      
418
418
      // Create the pipes
419
419
      std::set<int> KeepFDs;
 
420
      MergeKeepFdsFromConfiguration(KeepFDs);
420
421
      int Pipes[2];
421
422
      if (pipe(Pipes) != 0)
422
423
         return _error->Errno("pipe","Failed to create IPC pipe to subprocess");
1380
1381
      d->progress->StartDpkg();
1381
1382
      std::set<int> KeepFDs;
1382
1383
      KeepFDs.insert(fd[1]);
 
1384
      MergeKeepFdsFromConfiguration(KeepFDs);
1383
1385
      pid_t Child = ExecFork(KeepFDs);
1384
1386
      if (Child == 0)
1385
1387
      {
1528
1530
         if(stopOnError) 
1529
1531
         {
1530
1532
            CloseLog();
 
1533
            StopPtyMagic();
1531
1534
            d->progress->Stop();
1532
1535
            return false;
1533
1536
         }