diff options
| -rw-r--r-- | apt-pkg/acquire-item.cc | 2 | ||||
| -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 |
4 files changed, 6 insertions, 6 deletions
diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index ae10ed8f4..189d1e06b 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -153,7 +153,7 @@ static bool MessageInsecureRepository(bool const isError, std::string const &msg if (isError) { _error->Error("%s", msg.c_str()); - _error->Notice("%s", _("Updating such a repository securely is impossible and therefore disabled by default.")); + _error->Notice("%s", _("Updating from such a repository can't be done securely, and is therefore disabled by default.")); } else { 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 |