summaryrefslogtreecommitdiff
path: root/apt-pkg
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2010-03-26 16:04:49 +0100
committerMichael Vogt <michael.vogt@ubuntu.com>2010-03-26 16:04:49 +0100
commit47371b0047432ba7a5ee87173b00f912cdcd14e6 (patch)
treea9ced108b6ae38e7ab1338d55c43e0285f3959ea /apt-pkg
parentb34d4b4745e4f7ead090a03e5efe35bd2e2e82b5 (diff)
parent131418cfb2b83fb725fff62b0401252fef5655e2 (diff)
* apt-pkg/deb/dpkgpm.cc:
- fix backgrounding when dpkg runs (closes: #486222) * cmdline/apt-mark: - show error on incorrect aguments (LP: #517917), thanks to Torsten Spindler * cmdline/apt-get.cc: - if apt-get source foo=version or foo/distro can not be found, error out (LP: #502641) * apt-pkg/packagemanager.cc: - better debug output * doc/examples/configure-index: - add missing Debug::pkgPackageManager option
Diffstat (limited to 'apt-pkg')
-rw-r--r--apt-pkg/deb/dpkgpm.cc1
-rw-r--r--apt-pkg/packagemanager.cc5
2 files changed, 6 insertions, 0 deletions
diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index fb6054f79..5b02cae1d 100644
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -946,6 +946,7 @@ bool pkgDPkgPM::Go(int OutStatusFd)
rtt = tt;
cfmakeraw(&rtt);
rtt.c_lflag &= ~ECHO;
+ rtt.c_lflag |= ISIG;
// block SIGTTOU during tcsetattr to prevent a hang if
// the process is a member of the background process group
// http://www.opengroup.org/onlinepubs/000095399/functions/tcsetattr.html
diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc
index 491bff110..b747fa78a 100644
--- a/apt-pkg/packagemanager.cc
+++ b/apt-pkg/packagemanager.cc
@@ -338,6 +338,9 @@ bool pkgPackageManager::DepAdd(pkgOrderList &OList,PkgIterator Pkg,int Depth)
return true;
if (List->IsFlag(Pkg,pkgOrderList::UnPacked) == false)
return false;
+
+ if (Debug)
+ std::clog << OutputInDepth(Depth) << "DepAdd: " << Pkg.Name() << std::endl;
// Put the package on the list
OList.push_back(Pkg);
@@ -391,6 +394,8 @@ bool pkgPackageManager::DepAdd(pkgOrderList &OList,PkgIterator Pkg,int Depth)
if (Bad == true)
{
+ if (Debug)
+ std::clog << OutputInDepth(Depth) << "DepAdd FAILS on: " << Pkg.Name() << std::endl;
OList.Flag(Pkg,0,pkgOrderList::Added);
OList.pop_back();
Depth--;