summaryrefslogtreecommitdiff
path: root/apt-pkg/deb
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2005-08-09 08:48:41 +0000
committerMichael Vogt <michael.vogt@ubuntu.com>2005-08-09 08:48:41 +0000
commit64995601ae9335dedd180d634940f1426598f7f0 (patch)
treeca85ef085246817351a1ba50f0fe43c4dc8c640a /apt-pkg/deb
parent4a28c4f1707f66abf5f3a142e69d2d868b3bc2ad (diff)
* merged with apt--main
Patches applied: * apt@packages.debian.org/apt--main--0--patch-109 Merge michael.vogt@ubuntu.com--2005/apt--progress-reporting--0 * apt@packages.debian.org/apt--main--0--patch-110 Merge michael.vogt@ubuntu.com--2005/apt--progress-reporting--0 * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-29 * changelog finalized * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-30 * propper (and sane) support for pmerror and pmconffile added
Diffstat (limited to 'apt-pkg/deb')
-rw-r--r--apt-pkg/deb/dpkgpm.cc60
1 files changed, 42 insertions, 18 deletions
diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index 79a8c312b..fe8fbca74 100644
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -612,20 +612,49 @@ bool pkgDPkgPM::Go(int OutStatusFd)
if (_config->FindB("Debug::pkgDPkgProgressReporting",false) == true)
std::clog << "got from dpkg '" << line << "'" << std::endl;
- // pass "error" and "conffile-prompt" messages from dpkg verbatim
- if((strncmp(line,"error",strlen("error")) == 0) ||
- (strncmp(line,"conffile-prompt",strlen("conffile-prompt")) == 0))
- {
- write(OutStatusFd, line, strlen(line));
- line[0]=0;
- continue;
- }
- // line contains the dpkg status info now. it has the form:
- // 'status: <pkg>: <pkg qstate>' (see dpkg(1) for details)
- char* list[5];
+ // the status we output
+ ostringstream status;
+
+ /* dpkg sends strings like this:
+ 'status: <pkg>: <pkg qstate>'
+ errors look like this:
+ 'status: /var/cache/apt/archives/krecipes_0.8.1-0ubuntu1_i386.deb : error : trying to overwrite `/usr/share/doc/kde/HTML/en/krecipes/krectip.png', which is also in package krecipes-data
+ and conffile-prompt like this
+ 'status: conffile-prompt: conffile : 'current-conffile' 'new-conffile' useredited distedited
+
+ */
+ char* list[4];
TokSplitString(':', line, list, 5);
char *pkg = list[1];
- char *action = list[2];
+ char *action = _strstrip(list[2]);
+
+ if(strncmp(action,"error",strlen("error")) == 0)
+ {
+ status << "pmerror:" << list[1]
+ << ":" << (Done/float(Total)*100.0)
+ << ":" << list[3]
+ << endl;
+ if(OutStatusFd > 0)
+ write(OutStatusFd, status.str().c_str(), status.str().size());
+ line[0]=0;
+ if (_config->FindB("Debug::pkgDPkgProgressReporting",false) == true)
+ std::clog << "send: '" << status.str() << "'" << endl;
+ continue;
+ }
+ if(strncmp(action,"conffile",strlen("conffile")) == 0)
+ {
+ status << "pmconffile:" << list[1]
+ << ":" << (Done/float(Total)*100.0)
+ << ":" << list[3]
+ << endl;
+ if(OutStatusFd > 0)
+ write(OutStatusFd, status.str().c_str(), status.str().size());
+ line[0]=0;
+ if (_config->FindB("Debug::pkgDPkgProgressReporting",false) == true)
+ std::clog << "send: '" << status.str() << "'" << endl;
+ continue;
+ }
+
vector<struct DpkgState> &states = PackageOps[pkg];
const char *next_action = NULL;
if(PackageOpsDone[pkg] < states.size())
@@ -642,7 +671,6 @@ bool pkgDPkgPM::Go(int OutStatusFd)
// we moved from one dpkg state to a new one, report that
PackageOpsDone[pkg]++;
Done++;
- ostringstream status;
// build the status str
status << "pmstatus:" << pkg
<< ":" << (Done/float(Total)*100.0)
@@ -651,11 +679,7 @@ bool pkgDPkgPM::Go(int OutStatusFd)
if(OutStatusFd > 0)
write(OutStatusFd, status.str().c_str(), status.str().size());
if (_config->FindB("Debug::pkgDPkgProgressReporting",false) == true)
- {
- std::clog << "send to fd: '" << status.str()
- << "'" << std::endl;
-
- }
+ std::clog << "send: '" << status.str() << "'" << endl;
}
if (_config->FindB("Debug::pkgDPkgProgressReporting",false) == true)