diff --git a/src/import/pull-common.c b/src/import/pull-common.c index 49f87bcac44..2d36bf6e4ad 100644 --- a/src/import/pull-common.c +++ b/src/import/pull-common.c @@ -531,7 +531,6 @@ int pull_verify(ImportVerify verify, PullJob *verity_job) { _cleanup_free_ char *fn = NULL; - VerificationStyle style; PullJob *verify_job; int r; @@ -579,11 +578,6 @@ int pull_verify(ImportVerify verify, return 0; assert(verify_job); - - r = verification_style_from_url(verify_job->url, &style); - if (r < 0) - return log_error_errno(r, "Failed to determine verification style from URL '%s': %m", verify_job->url); - assert(signature_job); assert(signature_job->state == PULL_JOB_DONE); diff --git a/src/import/pull-raw.c b/src/import/pull-raw.c index c069160cb43..900be21f59f 100644 --- a/src/import/pull-raw.c +++ b/src/import/pull-raw.c @@ -543,31 +543,11 @@ static void raw_pull_job_on_finished(PullJob *j) { return; if (p->signature_job && p->signature_job->error != 0) { - VerificationStyle style; - PullJob *verify_job; + assert(p->checksum_job || p->raw_job); - /* The signature job failed. Let's see if we actually need it */ - - verify_job = p->checksum_job ?: p->raw_job; /* if the checksum job doesn't exist this must be - * because the main job is the checksum file - * itself */ - - assert(verify_job); - - r = verification_style_from_url(verify_job->url, &style); - if (r < 0) { - log_error_errno(r, "Failed to determine verification style from checksum URL: %m"); - goto finish; - } - - if (style == VERIFICATION_PER_DIRECTORY) { /* A failed signature file download only matters - * in per-directory verification mode, since only - * then the signature is detached, and thus a file - * of its own. */ - r = log_error_errno(p->signature_job->error, - "Failed to retrieve signature file, cannot verify. (Try --verify=no?)"); - goto finish; - } + r = log_error_errno(p->signature_job->error, + "Failed to retrieve signature file, cannot verify. (Try --verify=no?)"); + goto finish; } PullJob *jj; diff --git a/src/import/pull-tar.c b/src/import/pull-tar.c index bf62b2e780d..6518c28d729 100644 --- a/src/import/pull-tar.c +++ b/src/import/pull-tar.c @@ -452,24 +452,11 @@ static void tar_pull_job_on_finished(PullJob *j) { return; if (p->signature_job && p->signature_job->error != 0) { - VerificationStyle style; - assert(p->checksum_job); - r = verification_style_from_url(p->checksum_job->url, &style); - if (r < 0) { - log_error_errno(r, "Failed to determine verification style from checksum URL: %m"); - goto finish; - } - - if (style == VERIFICATION_PER_DIRECTORY) { /* A failed signature file download only matters - * in per-directory verification mode, since only - * then the signature is detached, and thus a file - * of its own. */ - r = log_error_errno(p->signature_job->error, - "Failed to retrieve signature file, cannot verify. (Try --verify=no?)"); - goto finish; - } + r = log_error_errno(p->signature_job->error, + "Failed to retrieve signature file, cannot verify. (Try --verify=no?)"); + goto finish; } pull_job_close_disk_fd(p->tar_job);