Compare commits
1 commit
master
...
allan/requ
Author | SHA1 | Date | |
---|---|---|---|
![]() |
d9025cf8ce |
4 changed files with 7 additions and 5 deletions
|
@ -318,12 +318,12 @@ When to Check::
|
||||||
*Never*;;
|
*Never*;;
|
||||||
All signature checking is suppressed, even if signatures are present.
|
All signature checking is suppressed, even if signatures are present.
|
||||||
|
|
||||||
*Optional* (default);;
|
*Optional*;;
|
||||||
Signatures are checked if present; absence of a signature is not an
|
Signatures are checked if present; absence of a signature is not an
|
||||||
error. An invalid signature is a fatal error, as is a signature from a
|
error. An invalid signature is a fatal error, as is a signature from a
|
||||||
key not in the keyring.
|
key not in the keyring.
|
||||||
|
|
||||||
*Required*;;
|
*Required* (default);;
|
||||||
Signatures are required; absence of a signature or an invalid signature
|
Signatures are required; absence of a signature or an invalid signature
|
||||||
is a fatal error, as is a signature from a key not in the keyring.
|
is a fatal error, as is a signature from a key not in the keyring.
|
||||||
|
|
||||||
|
@ -349,7 +349,7 @@ level signatures for packages.
|
||||||
The built-in default is the following:
|
The built-in default is the following:
|
||||||
|
|
||||||
--------
|
--------
|
||||||
SigLevel = Optional TrustedOnly
|
SigLevel = Required TrustedOnly
|
||||||
--------
|
--------
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -109,8 +109,7 @@ config_t *config_new(void)
|
||||||
newconfig->logmask = ALPM_LOG_ERROR | ALPM_LOG_WARNING;
|
newconfig->logmask = ALPM_LOG_ERROR | ALPM_LOG_WARNING;
|
||||||
newconfig->configfile = strdup(CONFFILE);
|
newconfig->configfile = strdup(CONFFILE);
|
||||||
if(alpm_capabilities() & ALPM_CAPABILITY_SIGNATURES) {
|
if(alpm_capabilities() & ALPM_CAPABILITY_SIGNATURES) {
|
||||||
newconfig->siglevel = ALPM_SIG_PACKAGE | ALPM_SIG_PACKAGE_OPTIONAL |
|
newconfig->siglevel = ALPM_SIG_PACKAGE | ALPM_SIG_DATABASE;
|
||||||
ALPM_SIG_DATABASE | ALPM_SIG_DATABASE_OPTIONAL;
|
|
||||||
newconfig->localfilesiglevel = ALPM_SIG_USE_DEFAULT;
|
newconfig->localfilesiglevel = ALPM_SIG_USE_DEFAULT;
|
||||||
newconfig->remotefilesiglevel = ALPM_SIG_USE_DEFAULT;
|
newconfig->remotefilesiglevel = ALPM_SIG_USE_DEFAULT;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
self.description = 'download remote packages with -U with a URL filename'
|
self.description = 'download remote packages with -U with a URL filename'
|
||||||
self.require_capability("gpg")
|
self.require_capability("gpg")
|
||||||
self.require_capability("curl")
|
self.require_capability("curl")
|
||||||
|
self.option['SigLevel'] = ['Required']
|
||||||
|
|
||||||
url = self.add_simple_http_server({
|
url = self.add_simple_http_server({
|
||||||
# simple
|
# simple
|
||||||
|
|
|
@ -115,6 +115,8 @@ def mkcfgfile(filename, root, option, db):
|
||||||
data = ["[options]"]
|
data = ["[options]"]
|
||||||
for key, value in option.items():
|
for key, value in option.items():
|
||||||
data.extend(["%s = %s" % (key, j) for j in value])
|
data.extend(["%s = %s" % (key, j) for j in value])
|
||||||
|
if "SigLevel" not in option:
|
||||||
|
data.append("SigLevel = Never\n")
|
||||||
|
|
||||||
# Repositories
|
# Repositories
|
||||||
# sort by repo name so tests can predict repo order, rather than be
|
# sort by repo name so tests can predict repo order, rather than be
|
||||||
|
|
Loading…
Add table
Reference in a new issue