Verified Commit 4e6d2832 authored by boklm's avatar boklm
Browse files

Bug 26408: Remove redundant check of macos code signature in update_responses 

When CHECK_CODESIGNATURE_EXISTS is set (we set it when re-generating
incrementals for macos during the signing process), we were checking
that both the mar files from previous and new versions are code signed.
Checking that the mar file from the previous version is code signed is
not necessary since it is checked just before even when the
CHECK_CODESIGNATURE_EXISTS is not set.
parent 00f0cf66

tools/update-responses/update_responses

+4 −4
Original line number Diff line number Diff line
@@ -261,11 +261,11 @@ sub create_incremental_mar { 
                && ! -f "$tmpdir/A/Contents/_CodeSignature/CodeResources") {

        exit_error "Missing code signature in $from_version while creating $mar_file";

    }

    # Check that the version we update to is code signed (when re-generating

    # incrementals for macos during the signing process)

    if ($ENV{CHECK_CODESIGNATURE_EXISTS}) {

        unless (-f "$tmpdir/A/Contents/_CodeSignature/CodeResources"

            && -f "$tmpdir/B/Contents/_CodeSignature/CodeResources") {

            exit_error "Missing code signature while creating $mar_file";

        }

        exit_error "Missing code signature while creating $mar_file"

            unless -f "$tmpdir/B/Contents/_CodeSignature/CodeResources";

    }

    local $ENV{MOZ_PRODUCT_VERSION} = $new_version;

    local $ENV{MAR_CHANNEL_ID} = get_config($config, $new_version, $os, 'mar_channel_id');