APT

Merge lp:~cjwatson/apt/dlstatus-not-quiet into lp:~ubuntu-core-dev/apt/ubuntu

  1. dlstatus-not-quiet
  2. Merge into ubuntu
Proposed by Colin Watson
Status: Merged
Merged at revision: not available
Proposed branch: lp:~cjwatson/apt/dlstatus-not-quiet
Merge into: lp:~ubuntu-core-dev/apt/ubuntu
Diff against target: None lines
To merge this branch: bzr merge lp:~cjwatson/apt/dlstatus-not-quiet
Reviewer Review Type Date Requested Status
Michael Vogt Pending
Review via email: mp+4971@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Colin Watson (cjwatson) wrote :

Tested successfully with tasksel.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'cmdline/acqprogress.cc'
2--- cmdline/acqprogress.cc 2006-12-14 11:39:29 +0000
3+++ cmdline/acqprogress.cc 2009-03-26 23:52:26 +0000
4@@ -145,11 +145,11 @@
5 bandwidth and ETA indicator. */
6 bool AcqTextStatus::Pulse(pkgAcquire *Owner)
7 {
8+ pkgAcquireStatus::Pulse(Owner);
9+
10 if (Quiet > 0)
11 return true;
12
13- pkgAcquireStatus::Pulse(Owner);
14-
15 enum {Long = 0,Medium,Short} Mode = Long;
16
17 char Buffer[sizeof(BlankLine)];
18
19=== modified file 'debian/changelog'
20--- debian/changelog 2009-03-26 12:44:09 +0000
21+++ debian/changelog 2009-03-26 23:52:26 +0000
22@@ -1,3 +1,11 @@
23+apt (0.7.20.2ubuntu5) UNRELEASED; urgency=low
24+
25+ * cmdline/acqprogress.cc:
26+ - Call pkgAcquireStatus::Pulse even if quiet, so that we still get
27+ dlstatus messages on the status-fd (LP: #290234).
28+
29+ -- Colin Watson <cjwatson@ubuntu.com> Thu, 26 Mar 2009 23:50:56 +0000
30+
31 apt (0.7.20.2ubuntu4) jaunty; urgency=low
32
33 * ftparchive/cachedb.cc:
34
35=== modified file 'pre-build.sh' (properties changed: -x to +x)

Subscribers

People subscribed via source and target branches

to all changes: