summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--apt-pkg/deb/dpkgpm.cc1
-rw-r--r--apt-pkg/packagemanager.cc5
-rw-r--r--cmdline/apt-get.cc12
-rwxr-xr-xcmdline/apt-mark3
-rw-r--r--debian/changelog14
-rw-r--r--doc/examples/configure-index1
6 files changed, 31 insertions, 5 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--;
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 5a814e255..3c90354b0 100644
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -1317,9 +1317,11 @@ pkgSrcRecords::Parser *FindSrc(const char *Name,pkgRecords &Recs,
if (Src.empty() == true)
{
// Sources files have no codename information
- if (VerTag.empty() == true && DefRel.empty() == false)
- _error->Warning(_("Ignore unavailable target release '%s' of package '%s'"), DefRel.c_str(), TmpSrc.c_str());
- DefRel.clear();
+ if (VerTag.empty() == true && DefRel.empty() == false)
+ {
+ _error->Error(_("Ignore unavailable target release '%s' of package '%s'"), DefRel.c_str(), TmpSrc.c_str());
+ return 0;
+ }
}
}
if (Src.empty() == true)
@@ -1386,8 +1388,8 @@ pkgSrcRecords::Parser *FindSrc(const char *Name,pkgRecords &Recs,
if (Last != 0 || VerTag.empty() == true)
break;
//if (VerTag.empty() == false && Last == 0)
- _error->Warning(_("Ignore unavailable version '%s' of package '%s'"), VerTag.c_str(), TmpSrc.c_str());
- VerTag.clear();
+ _error->Error(_("Ignore unavailable version '%s' of package '%s'"), VerTag.c_str(), TmpSrc.c_str());
+ return 0;
}
if (Last == 0 || Last->Jump(Offset) == false)
diff --git a/cmdline/apt-mark b/cmdline/apt-mark
index 0e73dda78..31383d987 100755
--- a/cmdline/apt-mark
+++ b/cmdline/apt-mark
@@ -82,6 +82,9 @@ if __name__ == "__main__":
else:
STATE_FILE=options.filename
+ if len(args) == 0:
+ parser.error("first argument must be 'markauto', 'unmarkauto' or 'showauto'")
+
if args[0] == "showauto":
show_automatic(STATE_FILE)
else:
diff --git a/debian/changelog b/debian/changelog
index 133d3874d..f166b7d32 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,6 +26,20 @@ apt (0.7.26~exp3) UNRELEASED; urgency=low
- Fix the libraries name to be e.g. libapt-pkg4.9 instead of
libapt-pkg-4.9.
+ [ Michael Vogt ]
+ * 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
+
-- Christian Perrier <bubulle@debian.org> Wed, 24 Feb 2010 22:13:50 +0100
apt (0.7.26~exp2) experimental; urgency=low
diff --git a/doc/examples/configure-index b/doc/examples/configure-index
index f07302efd..7166ec2b3 100644
--- a/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@ -418,6 +418,7 @@ Debug
pkgDPkgPM "false";
pkgDPkgProgressReporting "false";
pkgOrderList "false";
+ pkgPackageManager "false"; // OrderList/Configure debugging
pkgAutoRemove "false"; // show information about automatic removes
BuildDeps "false";
pkgInitialize "false"; // This one will dump the configuration space