diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2006-07-26 23:29:20 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2006-07-26 23:29:20 +0200 |
| commit | af5a94f4c7b1f2cc797cd1e023e36a1bb359689d (patch) | |
| tree | b95e2e27ec3f5b020b055da187bb2012b1921aa3 /apt-inst | |
| parent | 60681f9354217c830943315951e6559253bfa832 (diff) | |
| parent | 4577fda2b5f2b21f5400d10f4db71a8095f0df58 (diff) | |
* merged with mainline
Diffstat (limited to 'apt-inst')
| -rw-r--r-- | apt-inst/contrib/extracttar.cc | 3 | ||||
| -rw-r--r-- | apt-inst/deb/dpkgdb.cc | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/apt-inst/contrib/extracttar.cc b/apt-inst/contrib/extracttar.cc index d6da802fe..062c06fa4 100644 --- a/apt-inst/contrib/extracttar.cc +++ b/apt-inst/contrib/extracttar.cc @@ -136,7 +136,8 @@ bool ExtractTar::StartGzip() const char *Args[3]; string confvar = string("dir::bin::") + DecompressProg; - Args[0] = _config->Find(confvar.c_str(),DecompressProg.c_str()).c_str(); + string argv0 = _config->Find(confvar.c_str(),DecompressProg.c_str()); + Args[0] = argv0.c_str(); Args[1] = "-d"; Args[2] = 0; execvp(Args[0],(char **)Args); diff --git a/apt-inst/deb/dpkgdb.cc b/apt-inst/deb/dpkgdb.cc index c6a0e80e6..718e1ab98 100644 --- a/apt-inst/deb/dpkgdb.cc +++ b/apt-inst/deb/dpkgdb.cc @@ -383,7 +383,7 @@ bool debDpkgDB::ReadyFileList(OpProgress &Progress) return _error->Error(_("The pkg cache must be initialized first")); if (FList != 0) { - Progress.OverallProgress(1,1,1,_("Reading file list")); + Progress.OverallProgress(1,1,1,_("Reading file listing")); return true; } |