diff options
| author | David Kalnischkies <david@kalnischkies.de> | 2015-10-20 18:31:10 +0200 |
|---|---|---|
| committer | David Kalnischkies <david@kalnischkies.de> | 2015-11-04 18:04:02 +0100 |
| commit | 995a4bf6d770a5cc824c38388909f23fcca558c3 (patch) | |
| tree | 11414da9fc90e6982e63888f4ea6d84a25daf72b /test/integration/framework | |
| parent | 9fd6772b202295d7f643bd94681428c0caffd026 (diff) | |
disable updating insecure repositories in apt by default
apt is an interactive command and the reasons we haven't this option set
for everything is mostly in keeping compatibility for a little while
longer to allow scripts to be changed if need be.
Diffstat (limited to 'test/integration/framework')
| -rw-r--r-- | test/integration/framework | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/test/integration/framework b/test/integration/framework index 8b85cb71e..f9bb2e824 100644 --- a/test/integration/framework +++ b/test/integration/framework @@ -388,12 +388,8 @@ EOF TEST_DEFAULT_GROUP="$USER" fi - # Acquire::AllowInsecureRepositories=false is not yet the default - # but we want it to be the default soon - configallowinsecurerepositories "false"; - # cleanup the environment a bit - # prefer our apt binaries over the system apt binaries + # prefer our apt binaries over the system apt binaries export PATH="${BUILDDIRECTORY}:${PATH}:/usr/local/sbin:/usr/sbin:/sbin" export LC_ALL=C.UTF-8 unset LANGUAGE APT_CONFIG @@ -506,12 +502,6 @@ int execvp(const char *file, char *const argv[]) { EOF testsuccess --nomsg gcc -fPIC -shared -o noopchroot.so noopchroot.c -ldl } - -configallowinsecurerepositories() { - echo "Acquire::AllowInsecureRepositories \"$1\";" > rootdir/etc/apt/apt.conf.d/allow-insecure-repositories.conf - -} - configcompression() { while [ -n "$1" ]; do case "$1" in |