summaryrefslogtreecommitdiff
path: root/apt-pkg
diff options
context:
space:
mode:
authorArch Librarian <arch@canonical.com>2004-09-20 16:52:37 +0000
committerArch Librarian <arch@canonical.com>2004-09-20 16:52:37 +0000
commitcf544e1458bbe2a245ce0275f3b69061604ecf2e (patch)
treeb7dc40fa9bad8eb889098d1d50f67066845ea158 /apt-pkg
parent6dd55be709d9dffdd380467193e0256ded60beb8 (diff)
Fixed a few minor dpkg settings
Author: jgg Date: 1999-01-31 08:55:53 GMT Fixed a few minor dpkg settings
Diffstat (limited to 'apt-pkg')
-rw-r--r--apt-pkg/deb/dpkgpm.cc8
1 files changed, 5 insertions, 3 deletions
diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index 9322a868d..3969aef22 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.6 1999/01/31 08:49:39 jgg Exp $
+// $Id: dpkgpm.cc,v 1.7 1999/01/31 08:55:53 jgg Exp $
/* ######################################################################
DPKG Package Manager - Provide an interface to dpkg
@@ -140,7 +140,7 @@ bool pkgDPkgPM::RunScripts(const char *Cnf)
{
Count -= 100;
for (; Opts != 0 && Count != 1; Opts = Opts->Next, Count--);
- _error->Error("Probablem executing scripts %s '%s'",Cnf,Opts->Value.c_str());
+ _error->Error("Problem executing scripts %s '%s'",Cnf,Opts->Value.c_str());
}
return _error->Error("Sub-process returned an error code");
@@ -213,6 +213,8 @@ bool pkgDPkgPM::Go()
{
for (;I != J && Size < 1024; I++)
{
+ if (I->File[0] != '/')
+ return _error->Error("Internal Error, Pathname to install is not absolute '%s'",I->File.c_str());
Args[n++] = I->File.c_str();
Size += strlen(Args[n-1]);
}
@@ -262,7 +264,7 @@ bool pkgDPkgPM::Go()
signal(SIGCONT,SIG_DFL);
signal(SIGTSTP,SIG_DFL);
- if (chdir(_config->FindDir("Dir::Cache::Archives").c_str()) != 0)
+ if (chdir(_config->FindDir("DPkg::Run-Directory","/").c_str()) != 0)
_exit(100);
// Close all of our FDs - just in case