diff options
| author | Julian Andres Klode <jak@debian.org> | 2015-08-14 10:50:56 +0200 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2015-08-14 10:50:56 +0200 |
| commit | 51c4e07f4cba0615ff269b5a8d04dfd3d1313b00 (patch) | |
| tree | 40ce3c71671144c3d367d42c06a7dfa91eb8dc5e /apt-pkg | |
| parent | dd14b7a562c54bb9ce551da1f8a80c78da5a4b6e (diff) | |
| parent | 14c50b58e938cf78ce2d32d4ec39979f7575c543 (diff) | |
Merge branch 'debian/experimental' of https://github.com/DonKult/apt into debian/experimental
Diffstat (limited to 'apt-pkg')
| -rw-r--r-- | apt-pkg/acquire-worker.cc | 2 | ||||
| -rw-r--r-- | apt-pkg/deb/dpkgpm.cc | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/apt-pkg/acquire-worker.cc b/apt-pkg/acquire-worker.cc index 2c84020fe..e9ef4e9ac 100644 --- a/apt-pkg/acquire-worker.cc +++ b/apt-pkg/acquire-worker.cc @@ -538,7 +538,7 @@ bool pkgAcquire::Worker::MediaChange(string Message) ostringstream msg,status; ioprintf(msg,_("Please insert the disc labeled: " "'%s' " - "in the drive '%s' and press enter."), + "in the drive '%s' and press [Enter]."), Media.c_str(),Drive.c_str()); status << "media-change: " // message << Media << ":" // media diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index c578cc338..644e4d8e4 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -1545,9 +1545,6 @@ bool pkgDPkgPM::Go(APT::Progress::PackageManager *progress) _exit(100); } - /* No Job Control Stop Env is a magic dpkg var that prevents it - from using sigstop */ - putenv((char *)"DPKG_NO_TSTP=yes"); execvp(Args[0], (char**) &Args[0]); cerr << "Could not exec dpkg!" << endl; _exit(100); |