diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2011-02-10 17:47:32 +0100 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2011-02-10 17:47:32 +0100 |
| commit | 196c511c97b83a16c551f4e767f5a8b0d4f77c45 (patch) | |
| tree | 4d9d3220128524891bfaf705f72c28f0505f456f | |
| parent | edc0ef102b5100acb6930ff27c4296eb101a35e7 (diff) | |
* merged lp:~evfool/apt/fix641673:
* merged lp:~evfool/apt/fix418552:
- Grammar fix for bug LP: #418552, thanks to Robert Roth
| -rw-r--r-- | apt-pkg/algorithms.cc | 4 | ||||
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rwxr-xr-x | test/integration/test-bug-595691-empty-and-broken-archive-files | 4 |
3 files changed, 8 insertions, 6 deletions
diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc index 0fbce3c2a..fc520d744 100644 --- a/apt-pkg/algorithms.cc +++ b/apt-pkg/algorithms.cc @@ -1493,9 +1493,9 @@ bool ListUpdate(pkgAcquireStatus &Stat, } if (TransientNetworkFailure == true) - _error->Warning(_("Some index files failed to download, they have been ignored, or old ones used instead.")); + _error->Warning(_("Some index files failed to download. They have been ignored, or old ones used instead.")); else if (Failed == true) - return _error->Error(_("Some index files failed to download, they have been ignored, or old ones used instead.")); + return _error->Error(_("Some index files failed to download. They have been ignored, or old ones used instead.")); // Run the success scripts if all was fine diff --git a/debian/changelog b/debian/changelog index 82d53c25a..986b6f876 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,11 @@ -apt (0.8.12) unstable; urgency=low +apt (0.8.12) UNRELEASED; urgency=low [ Michael Vogt ] - * merged lp:~evfool/apt/fix641673 + * merged lp:~evfool/apt/fix641673: - String-fix in the source and the translations for the grammatical mistake reported in bug LP: #641673, thanks to Robert Roth + * merged lp:~evfool/apt/fix418552: + - Grammar fix for bug LP: #418552, thanks to Robert Roth -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 10 Feb 2011 17:37:56 +0100 diff --git a/test/integration/test-bug-595691-empty-and-broken-archive-files b/test/integration/test-bug-595691-empty-and-broken-archive-files index 684559aa7..2179ba03b 100755 --- a/test/integration/test-bug-595691-empty-and-broken-archive-files +++ b/test/integration/test-bug-595691-empty-and-broken-archive-files @@ -97,7 +97,7 @@ Err file: Packages Empty files can't be valid archives W: Failed to fetch ${COMPRESSOR}:$(readlink -f aptarchive/Packages.$COMPRESS) Empty files can't be valid archives -E: Some index files failed to download, they have been ignored, or old ones used instead." "empty file Packages.$COMPRESS over file" +E: Some index files failed to download. They have been ignored, or old ones used instead." "empty file Packages.$COMPRESS over file" } testoverhttp() { @@ -131,7 +131,7 @@ Err http://localhost Packages Empty files can't be valid archives W: Failed to fetch ${COMPRESSOR}:$(readlink -f rootdir/var/lib/apt/lists/partial/localhost:8080_Packages) Empty files can't be valid archives -E: Some index files failed to download, they have been ignored, or old ones used instead." "empty file Packages.$COMPRESS over http" +E: Some index files failed to download. They have been ignored, or old ones used instead." "empty file Packages.$COMPRESS over http" } for COMPRESSOR in 'gzip' 'bzip2' 'lzma'; do testoverfile $COMPRESSOR; done |