diff options
author | Justin B Rye <justin.byam.rye@gmail.com> | 2015-11-22 10:14:12 +0100 |
---|---|---|
committer | David Kalnischkies <david@kalnischkies.de> | 2015-11-25 15:20:10 +0100 |
commit | 839603418384565a53d9aca7b23dbd7742e3ea77 (patch) | |
tree | 749ebdb7ac99a5a84b8ca2581b13a32f3e041c67 /test/integration | |
parent | b52c3af4f970349747e362fdb19a4253c825a08b (diff) |
slightly rephrase notice shown for insecure repositories
Git-Dch: Ignore
Diffstat (limited to 'test/integration')
-rwxr-xr-x | test/integration/test-apt-get-update-unauth-warning | 2 | ||||
-rwxr-xr-x | test/integration/test-apt-update-failure-propagation | 6 | ||||
-rwxr-xr-x | test/integration/test-apt-update-nofallback | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/test/integration/test-apt-get-update-unauth-warning b/test/integration/test-apt-get-update-unauth-warning index c2b20468a..6092ddb57 100755 --- a/test/integration/test-apt-get-update-unauth-warning +++ b/test/integration/test-apt-get-update-unauth-warning @@ -34,7 +34,7 @@ Err:2 file:$APTARCHIVE unstable Release File not found - ${APTARCHIVE}/dists/unstable/Release (2: No such file or directory) Reading package lists... E: The repository 'file:$APTARCHIVE unstable Release' does not have a Release file. -N: Updating such a repository securely is impossible and therefore disabled by default. +N: Updating from such a repository can't be done securely, and is therefore disabled by default. N: See apt-secure(8) manpage for repository creation and user configuration details." aptget update --no-allow-insecure-repositories # no package foo diff --git a/test/integration/test-apt-update-failure-propagation b/test/integration/test-apt-update-failure-propagation index 17d27bbaa..1514614ea 100755 --- a/test/integration/test-apt-update-failure-propagation +++ b/test/integration/test-apt-update-failure-propagation @@ -44,7 +44,7 @@ testsuccessequal "foo: pretest mv aptarchive/dists/stable aptarchive/dists/stable.good testfailuremsg "E: The repository 'https://localhost:${APTHTTPSPORT} stable Release' does not have a Release file. -N: Updating such a repository securely is impossible and therefore disabled by default. +N: Updating from such a repository can't be done securely, and is therefore disabled by default. N: See apt-secure(8) manpage for repository creation and user configuration details." apt update testfailure aptget update --no-allow-insecure-repositories testequalor2 "Hit:1 http://localhost:${APTHTTPPORT} sid InRelease @@ -54,7 +54,7 @@ Err:3 https://localhost:${APTHTTPSPORT} stable Release 404 Not Found Reading package lists... E: The repository 'https://localhost:${APTHTTPSPORT} stable Release' does not have a Release file. -N: Updating such a repository securely is impossible and therefore disabled by default. +N: Updating from such a repository can't be done securely, and is therefore disabled by default. N: See apt-secure(8) manpage for repository creation and user configuration details." "Ign:1 https://localhost:${APTHTTPSPORT} stable InRelease 404 Not Found Err:2 https://localhost:${APTHTTPSPORT} stable Release @@ -62,7 +62,7 @@ Err:2 https://localhost:${APTHTTPSPORT} stable Release Hit:3 http://localhost:${APTHTTPPORT} sid InRelease Reading package lists... E: The repository 'https://localhost:${APTHTTPSPORT} stable Release' does not have a Release file. -N: Updating such a repository securely is impossible and therefore disabled by default. +N: Updating from such a repository can't be done securely, and is therefore disabled by default. N: See apt-secure(8) manpage for repository creation and user configuration details." cat rootdir/tmp/testfailure.output mv aptarchive/dists/stable.good aptarchive/dists/stable diff --git a/test/integration/test-apt-update-nofallback b/test/integration/test-apt-update-nofallback index aeff1791d..92daa5512 100755 --- a/test/integration/test-apt-update-nofallback +++ b/test/integration/test-apt-update-nofallback @@ -34,7 +34,7 @@ EOF assert_update_is_refused_and_last_good_state_used() { testfailuremsg "E: The repository 'file:${APTARCHIVE} unstable Release' is no longer signed. -N: Updating such a repository securely is impossible and therefore disabled by default. +N: Updating from such a repository can't be done securely, and is therefore disabled by default. N: See apt-secure(8) manpage for repository creation and user configuration details." aptget update assert_repo_is_intact |