APT

Merge lp:~evfool/apt/fix418552 into lp:~ubuntu-core-dev/apt/ubuntu

  1. fix418552
  2. Merge into ubuntu
Proposed by Robert Roth
Status: Merged
Merge reported by: Michael Vogt
Merged at revision: not available
Proposed branch: lp:~evfool/apt/fix418552
Merge into: lp:~ubuntu-core-dev/apt/ubuntu
Diff against target: 37 lines (+4/-4)
2 files modified
apt-pkg/algorithms.cc (+2/-2)
test/integration/test-bug-595691-empty-and-broken-archive-files (+2/-2)
To merge this branch: bzr merge lp:~evfool/apt/fix418552
Reviewer Review Type Date Requested Status
Michael Vogt (community) Approve
Review via email: mp+48695@code.launchpad.net

Description of the change

Grammar fix for bug #418552.

To post a comment you must log in.
Revision history for this message
Michael Vogt (mvo) wrote :

Thanks, merged.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'apt-pkg/algorithms.cc'
2--- apt-pkg/algorithms.cc 2010-12-07 15:19:48 +0000
3+++ apt-pkg/algorithms.cc 2011-02-05 13:42:58 +0000
4@@ -1493,9 +1493,9 @@
5 }
6
7 if (TransientNetworkFailure == true)
8- _error->Warning(_("Some index files failed to download, they have been ignored, or old ones used instead."));
9+ _error->Warning(_("Some index files failed to download. They have been ignored, or old ones used instead."));
10 else if (Failed == true)
11- return _error->Error(_("Some index files failed to download, they have been ignored, or old ones used instead."));
12+ return _error->Error(_("Some index files failed to download. They have been ignored, or old ones used instead."));
13
14
15 // Run the success scripts if all was fine
16
17=== modified file 'test/integration/test-bug-595691-empty-and-broken-archive-files'
18--- test/integration/test-bug-595691-empty-and-broken-archive-files 2010-10-21 14:54:28 +0000
19+++ test/integration/test-bug-595691-empty-and-broken-archive-files 2011-02-05 13:42:58 +0000
20@@ -99,7 +99,7 @@
21 Undetermined Error
22 W: Failed to fetch file:$(readlink -f aptarchive/Packages.$COMPRESS) Undetermined Error
23
24-E: Some index files failed to download, they have been ignored, or old ones used instead." "empty file Packages.$COMPRESS over file"
25+E: Some index files failed to download. They have been ignored, or old ones used instead." "empty file Packages.$COMPRESS over file"
26 }
27
28 testoverhttp() {
29@@ -137,7 +137,7 @@
30 Undetermined Error
31 W: Failed to fetch http://localhost:8080/Packages.$COMPRESS Undetermined Error
32
33-E: Some index files failed to download, they have been ignored, or old ones used instead." "empty file Packages.$COMPRESS over http"
34+E: Some index files failed to download. They have been ignored, or old ones used instead." "empty file Packages.$COMPRESS over http"
35 }
36
37 for COMPRESSOR in 'gzip' 'bzip2' 'lzma'; do testoverfile $COMPRESSOR; done

Subscribers

People subscribed via source and target branches

to all changes: