diff options
| -rw-r--r-- | apt-pkg/acquire-worker.cc | 4 | ||||
| -rw-r--r-- | apt-pkg/deb/deblistparser.cc | 9 | ||||
| -rw-r--r-- | apt-pkg/deb/dpkgpm.cc | 12 |
3 files changed, 15 insertions, 10 deletions
diff --git a/apt-pkg/acquire-worker.cc b/apt-pkg/acquire-worker.cc index 28f8408b6..06a4460d1 100644 --- a/apt-pkg/acquire-worker.cc +++ b/apt-pkg/acquire-worker.cc @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: acquire-worker.cc,v 1.15 1998/12/05 01:45:20 jgg Exp $ +// $Id: acquire-worker.cc,v 1.16 1998/12/14 06:54:41 jgg Exp $ /* ###################################################################### Acquire Worker @@ -136,7 +136,7 @@ bool pkgAcquire::Worker::Start() Args[1] = 0; execv(Args[0],(char **)Args); cerr << "Failed to exec method " << Args[0] << endl; - exit(100); + _exit(100); } // Fix up our FDs diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc index 0e5be1266..585006451 100644 --- a/apt-pkg/deb/deblistparser.cc +++ b/apt-pkg/deb/deblistparser.cc @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: deblistparser.cc,v 1.11 1998/12/14 02:23:47 jgg Exp $ +// $Id: deblistparser.cc,v 1.12 1998/12/14 06:54:43 jgg Exp $ /* ###################################################################### Package Cache Generator - Generator for the cache structure. @@ -468,7 +468,12 @@ bool debListParser::LoadReleaseInfo(pkgCache::PkgFileIterator FileI, FileI->Label = WriteUniqString(Start,Stop - Start); if (Section.Find("Architecture",Start,Stop) == true) FileI->Architecture = WriteUniqString(Start,Stop - Start); - + + unsigned long Fl = 0; + if (Section.FindFlag("NotAutomatic",Fl,1) == false) + _error->Warning("Bad NotAutomatic flag"); + FileI->NotAutomatic = Fl; + return !_error->PendingError(); } /*}}}*/ diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index 228e45c48..b9c8cf968 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: dpkgpm.cc,v 1.4 1998/11/23 07:32:21 jgg Exp $ +// $Id: dpkgpm.cc,v 1.5 1998/12/14 06:54:44 jgg Exp $ /* ###################################################################### DPKG Package Manager - Provide an interface to dpkg @@ -171,7 +171,7 @@ bool pkgDPkgPM::Go() signal(SIGTSTP,SIG_DFL); if (chdir(_config->FindDir("Dir::Cache::Archives").c_str()) != 0) - exit(100); + _exit(100); // Close all of our FDs - just in case for (int K = 3; K != 40; K++) @@ -179,23 +179,23 @@ bool pkgDPkgPM::Go() int Flags,dummy; if ((Flags = fcntl(STDIN_FILENO,F_GETFL,dummy)) < 0) - exit(100); + _exit(100); // Discard everything in stdin before forking dpkg if (fcntl(STDIN_FILENO,F_SETFL,Flags | O_NONBLOCK) < 0) - exit(100); + _exit(100); while (read(STDIN_FILENO,&dummy,1) == 1); if (fcntl(STDIN_FILENO,F_SETFL,Flags & (~(long)O_NONBLOCK)) < 0) - exit(100); + _exit(100); /* No Job Control Stop Env is a magic dpkg var that prevents it from using sigstop */ setenv("DPKG_NO_TSTP","yes",1); execvp(Args[0],(char **)Args); cerr << "Could not exec dpkg!" << endl; - exit(100); + _exit(100); } // Wait for dpkg |