From edc0ef102b5100acb6930ff27c4296eb101a35e7 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 10 Feb 2011 17:38:16 +0100 Subject: * 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 --- test/integration/framework | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'test') diff --git a/test/integration/framework b/test/integration/framework index fe1db14bc..fe0ffb64f 100644 --- a/test/integration/framework +++ b/test/integration/framework @@ -590,12 +590,12 @@ testequalor2() { } testshowvirtual() { - local VIRTUAL="N: Can't select versions from package '$1' as it purely virtual" + local VIRTUAL="N: Can't select versions from package '$1' as it is purely virtual" local PACKAGE="$1" shift while [ -n "$1" ]; do VIRTUAL="${VIRTUAL} -N: Can't select versions from package '$1' as it purely virtual" +N: Can't select versions from package '$1' as it is purely virtual" PACKAGE="${PACKAGE} $1" shift done -- cgit v1.2.3 From 196c511c97b83a16c551f4e767f5a8b0d4f77c45 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 10 Feb 2011 17:47:32 +0100 Subject: * merged lp:~evfool/apt/fix641673: * merged lp:~evfool/apt/fix418552: - Grammar fix for bug LP: #418552, thanks to Robert Roth --- test/integration/test-bug-595691-empty-and-broken-archive-files | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'test') 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 -- cgit v1.2.3