summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2010-03-12 10:16:11 +0100
committerMichael Vogt <michael.vogt@ubuntu.com>2010-03-12 10:16:11 +0100
commit4df2e0640505f5e80fcbd9f167e4539637a251a6 (patch)
treeac599571fd845919b656e2054885403c52519851
parent3ed9acb90edb6fac452af21b2bb277ddb6ee63dc (diff)
parenteefacd4c6653485b3da8dc267a8068207398464b (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
-rw-r--r--apt-pkg/deb/dpkgpm.cc1
-rwxr-xr-xcmdline/apt-mark3
-rw-r--r--debian/changelog5
3 files changed, 9 insertions, 0 deletions
diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index f220e2bce..8ecb683d4 100644
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -958,6 +958,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/cmdline/apt-mark b/cmdline/apt-mark
index 2326ece38..466a56f27 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 8af45b1a9..7b20178ac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,11 @@ apt (0.7.25.3ubuntu2) UNRELEASED; urgency=low
* debian/apt.conf.autoremove:
- add "oldlibs" to the APT::Never-MarkAuto-Sections as its used
for transitional packages
+ * 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
[ Robert Collins ]
* Change the package index Info methods to allow apt-cache policy to be